diff --git a/Android.mk b/Android.mk
index 8888800..9cb7e2e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,6 +19,7 @@
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include frameworks/opt/setupwizard/navigationbar/common.mk
+include frameworks/base/packages/SettingsLib/common.mk
 
 include $(BUILD_PACKAGE)
 
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ad84ff9..35e679d 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">
@@ -70,6 +71,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"
@@ -86,7 +90,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 +137,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"
@@ -156,9 +163,12 @@
                 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 +195,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 +212,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 +243,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"
@@ -302,9 +313,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 +331,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 +424,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 +445,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 +476,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 +497,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 +518,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 +575,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 +602,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 +625,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 +649,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>
@@ -629,9 +669,12 @@
         <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 +689,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 +724,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 +745,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 +756,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 +771,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 +847,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 +869,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 +878,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 +892,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"
@@ -857,9 +932,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 +955,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 +977,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 +990,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 +1023,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 +1050,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,9 +1098,12 @@
                 android:label="@string/usage_access_title"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$SecuritySettingsActivity">
+            <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" />
-                <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -1043,9 +1136,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 +1158,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 +1178,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 +1198,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 +1216,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,7 +1230,7 @@
 
         <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>
@@ -1140,6 +1241,9 @@
         <activity android:name="ConfirmLockPassword"
             android:windowSoftInputMode="stateVisible|adjustResize"/>
 
+        <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"/>
@@ -1153,7 +1257,7 @@
             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 +1266,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,11 +1341,14 @@
                 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"
@@ -1277,37 +1384,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 +1405,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 +1424,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 +1453,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 +1487,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 +1520,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 +1530,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 +1564,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 +1575,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 +1586,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 +1603,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 +1695,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 +1705,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 +1723,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 +1752,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>
@@ -1674,9 +1773,12 @@
             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 +1791,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 +1813,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 +1831,7 @@
             android:theme="@style/Theme.SubSettingsDialogWhenLarge"/>
 
         <activity android:name=".CryptKeeper"
+                  androidprv:primaryUserOnly="true"
                   android:immersive="true"
                   android:launchMode="singleTop"
                   android:excludeFromRecents="true"
@@ -1752,9 +1861,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 +1892,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 +1912,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 +1931,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 +1951,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 +1963,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 +1973,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 +1982,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"
@@ -1875,9 +1999,12 @@
         <activity android:name="Settings$ConditionProviderSettingsActivity"
                   android:label="@string/manage_condition_providers"
                   android:taskAffinity="">
+            <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" />
-                <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"
@@ -1890,9 +2017,12 @@
                 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 +2039,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 +2072,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 +2092,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 +2101,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 +2177,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"
@@ -2058,6 +2200,23 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="Settings$WifiCallingSettingsActivity"
+                  android:label="@string/wifi_calling_settings_title"
+                  android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.WIFI_CALLING_SETTINGS" />
+                <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.WifiCallingSettings" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                       android:resource="@id/wireless_settings" />
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"
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/xml/quick_launch_settings.xml b/res/color/lock_pattern_view_success_color.xml
similarity index 66%
copy from res/xml/quick_launch_settings.xml
copy to res/color/lock_pattern_view_success_color.xml
index eb5585c..075e919 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/color/lock_pattern_view_success_color.xml
@@ -1,5 +1,5 @@
 <?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.
@@ -14,10 +14,6 @@
      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>   
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?android:attr/colorAccent" />
+</selector>
diff --git a/res/xml/quick_launch_settings.xml b/res/color/unlock_pattern_view_success_color.xml
similarity index 66%
copy from res/xml/quick_launch_settings.xml
copy to res/color/unlock_pattern_view_success_color.xml
index eb5585c..075e919 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/color/unlock_pattern_view_success_color.xml
@@ -1,5 +1,5 @@
 <?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.
@@ -14,10 +14,6 @@
      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>   
+<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_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-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-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-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-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_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-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_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-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_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-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_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/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/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/xml/quick_launch_settings.xml b/res/drawable/ic_expand.xml
similarity index 66%
rename from res/xml/quick_launch_settings.xml
rename to res/drawable/ic_expand.xml
index eb5585c..72da2b9 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/drawable/ic_expand.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.
@@ -14,10 +15,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. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-</PreferenceScreen>   
+    <item android:state_checked="true" android:drawable="@drawable/ic_expand_less" />
+
+    <item android:drawable="@drawable/ic_expand_more" />
+
+</selector>
diff --git a/res/drawable/ic_expand_less.xml b/res/drawable/ic_expand_less.xml
new file mode 100644
index 0000000..3a00faf
--- /dev/null
+++ b/res/drawable/ic_expand_less.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.
+-->
+
+<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/ic_expand_more.xml b/res/drawable/ic_expand_more.xml
new file mode 100644
index 0000000..64d2242
--- /dev/null
+++ b/res/drawable/ic_expand_more.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.
+-->
+
+<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_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/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/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/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
index b525b68..bee46ed 100644
--- a/res/layout-land/setup_preference.xml
+++ b/res/layout-land/setup_preference.xml
@@ -37,15 +37,6 @@
 
     </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"
diff --git a/res/layout-sw600dp-land/setup_preference.xml b/res/layout-sw600dp-land/setup_preference.xml
index 814bc91..883d1de 100644
--- a/res/layout-sw600dp-land/setup_preference.xml
+++ b/res/layout-sw600dp-land/setup_preference.xml
@@ -53,15 +53,6 @@
                 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"
diff --git a/res/layout-sw600dp/setup_preference.xml b/res/layout-sw600dp/setup_preference.xml
index ec6d2ac..cc12003 100644
--- a/res/layout-sw600dp/setup_preference.xml
+++ b/res/layout-sw600dp/setup_preference.xml
@@ -51,15 +51,6 @@
                 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"
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_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_preferred_settings.xml b/res/layout/app_preferred_settings.xml
new file mode 100644
index 0000000..533887d
--- /dev/null
+++ b/res/layout/app_preferred_settings.xml
@@ -0,0 +1,83 @@
+<?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">
+
+        <!-- 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>
+
+    </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/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/filter_spinner_item.xml b/res/layout/filter_spinner_item.xml
new file mode 100644
index 0000000..e83dd80
--- /dev/null
+++ b/res/layout/filter_spinner_item.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<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: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/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/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/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/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/setup_preference.xml b/res/layout/setup_preference.xml
index 46829c0..d07d4a3 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -22,15 +22,6 @@
     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"
diff --git a/res/layout/setup_wifi_empty.xml b/res/layout/setup_wifi_empty.xml
new file mode 100644
index 0000000..52864f9
--- /dev/null
+++ b/res/layout/setup_wifi_empty.xml
@@ -0,0 +1,24 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/setup_wizard_margin_top"
+    android:paddingStart="@dimen/setup_wizard_margin_sides"
+    android:paddingEnd="@dimen/setup_wizard_margin_sides"
+    android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
diff --git a/res/layout/setup_wifi_required_info.xml b/res/layout/setup_wifi_required_info.xml
new file mode 100644
index 0000000..574366a
--- /dev/null
+++ b/res/layout/setup_wifi_required_info.xml
@@ -0,0 +1,27 @@
+<?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.
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/wifi_required_info"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="@dimen/setup_wizard_margin_top"
+    android:paddingBottom="6dip"
+    android:paddingStart="@dimen/setup_wizard_margin_sides"
+    android:paddingEnd="@dimen/setup_wizard_margin_sides"
+    android:text="@string/wifi_required_info_text"
+    android:textAppearance="@style/TextAppearance.SetupWizardDescription" />
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/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/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index 30043c4..7a038cb 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -66,6 +66,31 @@
                     style="@style/wifi_item_content"
                     android:prompt="@string/wifi_security"
                     android:entries="@array/wifi_ap_security" />
+
+            <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item_label"
+                    android:layout_marginTop="8dip"
+                    android:text="@string/wifi_ap_band_config" />
+
+               <RadioGroup android:id = "@+id/choose_channel"
+                       android:layout_width="fill_parent"
+                       android:layout_height="wrap_content"
+                       android:orientation="vertical">
+
+                   <RadioButton android:id="@+id/ap_2G_band"
+                           android:layout_width="match_parent"
+                           android:layout_height="wrap_content"
+                           android:text="@string/wifi_ap_choose_2G"
+                           android:layout_marginTop="8dip"/>
+
+                   <RadioButton android:id="@+id/ap_5G_band"
+                           android:layout_width="match_parent"
+                           android:layout_height="wrap_content"
+                           android:text="@string/wifi_ap_choose_5G"
+                           android:layout_marginTop="8dip"/>
+               </RadioGroup>
         </LinearLayout>
 
         <LinearLayout android:id="@+id/fields"
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/xml/quick_launch_settings.xml b/res/menu/manage_apps.xml
similarity index 64%
copy from res/xml/quick_launch_settings.xml
copy to res/menu/manage_apps.xml
index eb5585c..577e981 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/menu/manage_apps.xml
@@ -1,5 +1,5 @@
 <?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.
@@ -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>   
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/advanced"
+        android:title="@string/advanced_apps"
+        android:icon="@drawable/ic_settings_24dp"
+        android:showAsAction="collapseActionView|ifRoom" />
+</menu>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 7440ebb..b0b29ef 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Altyd"</item>
     <item msgid="844721238536786870">"Slegs wanneer ingeprop"</item>
-    <item msgid="2990218920631468642">"Nooit (verhoog datagebruik)"</item>
+    <item msgid="1986753720941888596">"Nooit"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Altyd"</item>
     <item msgid="7433294150916905997">"Slegs wanneer ingeprop"</item>
     <item msgid="1390404486722375028">"Nooit"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Afgelope 30 dae"</item>
+    <item msgid="6600989128423965319">"Stel gebruiksiklus …"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Outo"</item>
+    <item msgid="1013988753804838790">"Outomaties"</item>
     <item msgid="6670588712989942178">"Net 5 GHz"</item>
     <item msgid="2715516524973207876">"Net 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Gebruikstyd"</item>
-    <item msgid="3703676222230317933">"Bekendstelling-aftelling"</item>
+    <item msgid="4796160515314745154">"Laas gebruik"</item>
     <item msgid="2502754479975776899">"Programnaam"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"wekkervolume"</item>
     <item msgid="785049718065337473">"kennisgewingvolume"</item>
     <item msgid="6700305533746877052">"bluetoothvolume"</item>
-    <item msgid="3810969981743709839">"demp of ontdemp mikrofoon"</item>
-    <item msgid="2627903914574908209">"hou wakker"</item>
-    <item msgid="1395372654968157578">"monitor ligging"</item>
-    <item msgid="3238451051299611853">"monitor hoëkrag-ligging"</item>
+    <item msgid="2029227495214047094">"hou wakker"</item>
+    <item msgid="26109888160231211">"monitor ligging"</item>
+    <item msgid="5753382310468855812">"monitor hoë kragligging"</item>
+    <item msgid="3356591542543137332">"kry gebruikstatistiek"</item>
+    <item msgid="3073734345226842233">"demp of ontdemp mikrofoon"</item>
+    <item msgid="1148142988678569310">"projekmedia"</item>
+    <item msgid="9130014005474445273">"aktiveer VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ligging"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Wekkervolume"</item>
     <item msgid="9103719301075748925">"Kennisgewingvolume"</item>
     <item msgid="7025966722295861512">"Bluetoothvolume"</item>
-    <item msgid="2265317984004577529">"Demp of ontdemp mikrofoon"</item>
-    <item msgid="3646325683886507917">"Hou wakker"</item>
+    <item msgid="4665183401128289653">"Hou wakker"</item>
+    <item msgid="8584357129746649222">"Ligging"</item>
     <item msgid="7669257279311110599">"Ligging"</item>
-    <item msgid="7745724368696313169">"Ligging"</item>
+    <item msgid="3459320345690097795">"Kry gebruikstatistiek"</item>
+    <item msgid="1312534577834048535">"Demp of ontdemp mikrofoon"</item>
+    <item msgid="5906017727368097853">"Projekmedia"</item>
+    <item msgid="2486614710846178542">"Aktiveer VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Verstek"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif gekondenseer"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Gemaklik"</item>
-    <item msgid="961716102408512888">"Kursief"</item>
-    <item msgid="784581717183349567">"Klein hoofletters"</item>
+    <item msgid="7247838127505318669">"Sans-serif-enkelspasie"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif-enkelspasie"</item>
+    <item msgid="639503332147461010">"Gemaklik"</item>
+    <item msgid="7967169925231332424">"Kursief"</item>
+    <item msgid="561832997193039673">"Klein hoofletters"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Baie klein"</item>
@@ -375,6 +385,11 @@
     <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 logbuffer"</item>
     <item msgid="2822309747675758628">"256 K per logbuffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Gekas (aktiwiteitkliënt)"</item>
     <item msgid="6652164677254579050">"Gekas (leeg)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blougroen"</item>
+    <item msgid="8332294763632946560">"Blou"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Pers"</item>
+    <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 2868b81..bfc523f 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skandeer"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gevorderd"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Wys programme"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wys Wi-Fi-sterkte"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Onthou netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-oproepmodus"</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>
+    <item msgid="3132912693346866895">"Net Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Af"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Verkieslik Wi-Fi (Gebruik selnetwerk net as Wi-Fi nie beskikbaar is nie)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Verkieslik sellulêr (Gebruik Wi-Fi net as selnetwerk nie beskikbaar is nie)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Net Wi-Fi (Gebruik nooit selnetwerk nie. Kan nie oproepe maak of ontvang as daar nie Wi-Fi is nie)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Batterystatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteryvlak"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Dit sal alle instellings wat verband hou met netwerke terugstel na die fabriekverstekke, insluitend:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobiele data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Stel instellings terug"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling omkeer nie!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Stel instellings terug"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Jy moet jou ontsluitpatroon teken om \'n terugstelling van netwerkinstellings te bevestig."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Stel terug?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Terugstelling van netwerkinstellings"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"programme aflaai programme stelsel"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"programme toestemmings sekuriteit"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d programme bied voorwaardes</item>
+      <item quantity="one">%d program bied 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Stel voorkeure vir alle programme terug na verstekwaardes"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> programme geïnstalleer, insluitend stelsel- en afgelaaide programme"</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>
 </resources>
diff --git a/res/values-am-nokeys/strings.xml b/res/values-am-nokeys/strings.xml
index 26b226d..27cbc54 100644
--- a/res/values-am-nokeys/strings.xml
+++ b/res/values-am-nokeys/strings.xml
@@ -16,5 +16,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="applications_settings_summary" msgid="6616938758022986257">"ትግበራዎች አዸራጅ"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"መተግበሪያዎች አዸራጅ"</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 5807c47..b37b21b 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ሁልጊዜ"</item>
     <item msgid="844721238536786870">"ሲሰካ ብቻ"</item>
-    <item msgid="2990218920631468642">"በፍፁም (የውሂብ አጠቃቀም ይጨምራል)"</item>
+    <item msgid="1986753720941888596">"በፍፁም"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ሁልጊዜ"</item>
     <item msgid="7433294150916905997">"ሲሰካ ብቻ"</item>
     <item msgid="1390404486722375028">"ፈፅሞ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"የመጨረሻዎቹ 30 ቀኖች"</item>
+    <item msgid="6600989128423965319">"የአጠቃቀም ዑደት አዘጋጅ..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ራስ ሰር"</item>
+    <item msgid="1013988753804838790">"ራስ-ሰር"</item>
     <item msgid="6670588712989942178">"5 GHz ብቻ"</item>
     <item msgid="2715516524973207876">"5 GHz ብቻ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ጊዜ አጠቃቀም"</item>
-    <item msgid="3703676222230317933">"ቆጠራ ጀምር"</item>
+    <item msgid="4796160515314745154">"ለመጨረሻ ጊዜ ጥቅም ላይ የዋለበት ጊዜ"</item>
     <item msgid="2502754479975776899">"መተግበሪያ ስም"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"የማንቂያ ድምፅ መጠን"</item>
     <item msgid="785049718065337473">"የማሳወቂያ ድምጽ መጠን"</item>
     <item msgid="6700305533746877052">"የብሉቱዝ ድምፅ መጠን"</item>
-    <item msgid="3810969981743709839">"የማይክሮፎን ድምጽ ዝጋ/አትዝጋ"</item>
-    <item msgid="2627903914574908209">"እንደነቃ አቆይ"</item>
-    <item msgid="1395372654968157578">"አካባቢን ተቆጣጠር"</item>
-    <item msgid="3238451051299611853">"የከፍተኛ ኃይል አካባቢ ተከታተል"</item>
+    <item msgid="2029227495214047094">"እንደነቃ አቆይ"</item>
+    <item msgid="26109888160231211">"አካባቢን ይቆጣጠሩ"</item>
+    <item msgid="5753382310468855812">"የከፍተኛ ኃይል አካባቢ ተከታተል"</item>
+    <item msgid="3356591542543137332">"የአጠቃቀም ስታቲስቲክስ ያግኙ"</item>
+    <item msgid="3073734345226842233">"ማይክሮፎን ድምፅ-ከል አድርግ/አንሳ"</item>
+    <item msgid="1148142988678569310">"ፕሮጀክት ሚዲያ"</item>
+    <item msgid="9130014005474445273">"VPN አግብር"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"አካባቢ"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"የማንቂያ ድምፅ መጠን"</item>
     <item msgid="9103719301075748925">"የማሳወቂያ ድምጽ መጠን"</item>
     <item msgid="7025966722295861512">"የብሉቱዝ ድምፅ መጠን"</item>
-    <item msgid="2265317984004577529">"የማይክሮፎን ድምጽ ዝጋ/አትዝጋ"</item>
-    <item msgid="3646325683886507917">"እንደነቃ አቆይ"</item>
+    <item msgid="4665183401128289653">"እንደነቃ አቆይ"</item>
+    <item msgid="8584357129746649222">"አካባቢ"</item>
     <item msgid="7669257279311110599">"አካባቢ"</item>
-    <item msgid="7745724368696313169">"አካባቢ"</item>
+    <item msgid="3459320345690097795">"የአጠቃቀም ስታቲስቲክሶችን ያግኙ"</item>
+    <item msgid="1312534577834048535">"ማይክሮፎን ድምፅ-ከል አድርግ/አንሳ"</item>
+    <item msgid="5906017727368097853">"ፕሮጀክት ሚዲያ"</item>
+    <item msgid="2486614710846178542">"VPN አግብር"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ነባሪ"</item>
     <item msgid="1016452621833735880">"ጭረት-አልባ"</item>
     <item msgid="2496277987934654454">"ጭረት-አልባ ተጨምቆ"</item>
-    <item msgid="4406003087391086325">"ባለጭረት"</item>
-    <item msgid="1558362802170124073">"ወጥ ስፋት"</item>
-    <item msgid="6857338041963571301">"የተለመደ"</item>
-    <item msgid="961716102408512888">"ቅጥልጥል"</item>
-    <item msgid="784581717183349567">"ትንንሽ አብይ ሆሄያት"</item>
+    <item msgid="7247838127505318669">"ሳንስ ሰሪፍ ሞኖስፔስ"</item>
+    <item msgid="4478414822462359763">"ሰሪፍ"</item>
+    <item msgid="7502451783483660829">"ሰሪፍ ሞኖስፔስ"</item>
+    <item msgid="639503332147461010">"የተለመደ"</item>
+    <item msgid="7967169925231332424">"ቅጥልጥል"</item>
+    <item msgid="561832997193039673">"ትንሽ አብይ ሆሄያት"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"በጣም ትንሽ"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 ሜባ"</item>
     <item msgid="3025431211013424097">"16 ሜባ"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 ኪባ"</item>
+    <item msgid="3534782711045262344">"256 ኪባ"</item>
+    <item msgid="8085867209202153403">"1 ሜባ"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 ኪባ በምዝግብ ማስታወሻ ቋጥ"</item>
     <item msgid="2822309747675758628">"256 ኪባ በምዝግብ ማስታወሻ ቋጥ"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
     <item msgid="6652164677254579050">"የተሸጎጠ (ባዶ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ጥቁር አረንጓዴ-ሰማያዊ"</item>
+    <item msgid="8332294763632946560">"ሰማያዊ"</item>
+    <item msgid="2023216417616991392">"ወይን ጠጅ"</item>
+    <item msgid="3170497246594232819">"ሐምራዊ"</item>
+    <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 e531f02..33660c2 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>
@@ -137,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>
@@ -156,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>
@@ -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="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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ከፍተኛ ብሉቱዝ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ብሉቱዝ ሲበራ መሣሪያዎ ሌልች በአቅራቢያ ካሉ መሣሪያዎች ጋር መገናኘት ይችላል።"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ቃኝ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ከፍተኛ"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"መተግበሪያዎችን አሳይ"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"የWiFi ጥንካሬን አሳይ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"አውታረ መረብን አስታውስ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"አውታረ መረብ እርሳ"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi ጥሪ ሁነታ"</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>
+    <item msgid="3132912693346866895">"Wi-Fi ብቻ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ጠፍቷል"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"የWi-Fi ተመራጭ (Wi-Fi በማይገኝበት ጊዜ ብቻ ተንቀሳቃሽ ስልክ አውታረ መረብን ይጠቀማል)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"የተንቀሳቃሽ ስልክ ተመራጭ (የተንቀሳቃሽ ስልክ በማይገኝበት ጊዜ ብቻ Wi-Fi ይጠቀማል)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"የባትሪሁኔታ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"የባትሪደረጃ፡"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"ይህ፦\n\n"<li>"Wifi"</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="1745138973574945389">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይቀናበሩ? ይህን እርምጃ መቀልበስ አይችሉም!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበርን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትን መሳል ያስፈልግዎታል።"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ዳግም ይቀናበር?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"የአውታረ መረብ ቅንብሮች ዳግም ማቀናበር"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"አካባቢን ለማወቅ ጂ ፒ ኤስ ተጠቀም"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"በመቃኘት ላይ"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"በመቃኘት ላይ"</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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"መተግበሪያዎች ውርድ መተግበሪያዎች ስርዓት"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"የመተግበሪያዎች ፈቃዶች ደህንነት"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d መተግበሪያዎች ሁኔታዎችን ያቀርባሉ</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"የሁሉም መተግበሪያዎች ምርጫዎችን ወደ ነባሪዎች ዳግም አስጀምር"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> መተግበሪያዎች ተጭነዋል፣ የስርዓት እና የወረዱ መተግበሪያዎችንም ጨምሮ"</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>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 22ed540..3a368e2 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"دومًا"</item>
     <item msgid="844721238536786870">"عند التوصيل فقط"</item>
-    <item msgid="2990218920631468642">"مطلقًا (لزيادة استخدام البيانات)"</item>
+    <item msgid="1986753720941888596">"مطلقًا"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"دومًا"</item>
     <item msgid="7433294150916905997">"عند التوصيل فقط"</item>
     <item msgid="1390404486722375028">"مطلقًا"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"آخر 30 يومًا"</item>
+    <item msgid="6600989128423965319">"تعيين دورة الاستخدام..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"تلقائي"</item>
+    <item msgid="1013988753804838790">"تلقائي"</item>
     <item msgid="6670588712989942178">"5 غيغاهيرتز فقط"</item>
     <item msgid="2715516524973207876">"2.4 غيغاهيرتر فقط"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"وقت الاستخدام"</item>
-    <item msgid="3703676222230317933">"عدد عمليات التشغيل"</item>
+    <item msgid="4796160515314745154">"آخر مرة تم استخدامه"</item>
     <item msgid="2502754479975776899">"اسم التطبيق"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"مستوى صوت المنبه"</item>
     <item msgid="785049718065337473">"مستوى صوت الإشعار"</item>
     <item msgid="6700305533746877052">"مستوى صوت البلوتوث"</item>
-    <item msgid="3810969981743709839">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
-    <item msgid="2627903914574908209">"البقاء في الوضع النشط"</item>
-    <item msgid="1395372654968157578">"مراقبة الموقع"</item>
-    <item msgid="3238451051299611853">"مراقبة موقع متميز"</item>
+    <item msgid="2029227495214047094">"البقاء في الوضع النشط"</item>
+    <item msgid="26109888160231211">"مراقبة الموقع"</item>
+    <item msgid="5753382310468855812">"مراقبة موقع متميز"</item>
+    <item msgid="3356591542543137332">"الحصول على إحصاءات الاستخدام"</item>
+    <item msgid="3073734345226842233">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
+    <item msgid="1148142988678569310">"وسائط المشروع"</item>
+    <item msgid="9130014005474445273">"تنشيط الشبكة الظاهرية الخاصة"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"الموقع"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"مستوى صوت المنبّه"</item>
     <item msgid="9103719301075748925">"مستوى صوت الإشعار"</item>
     <item msgid="7025966722295861512">"مستوى صوت البلوتوث"</item>
-    <item msgid="2265317984004577529">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
-    <item msgid="3646325683886507917">"البقاء في الوضع النشط"</item>
+    <item msgid="4665183401128289653">"البقاء في الوضع النشط"</item>
+    <item msgid="8584357129746649222">"الموقع"</item>
     <item msgid="7669257279311110599">"الموقع"</item>
-    <item msgid="7745724368696313169">"الموقع"</item>
+    <item msgid="3459320345690097795">"الحصول على إحصاءات الاستخدام"</item>
+    <item msgid="1312534577834048535">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
+    <item msgid="5906017727368097853">"وسائط المشروع"</item>
+    <item msgid="2486614710846178542">"تنشيط الشبكة الظاهرية الخاصة"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"افتراضي"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"‏Sans-serif مكثف"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"عادية"</item>
-    <item msgid="961716102408512888">"متصلة"</item>
-    <item msgid="784581717183349567">"أحرف استهلالية صغيرة"</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">"أحرف استهلالية صغيرة"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"صغير جدًا"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 ميغابايت"</item>
     <item msgid="3025431211013424097">"16 ميغابايت"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 كيلوبايت"</item>
+    <item msgid="3534782711045262344">"256 كيلوبايت"</item>
+    <item msgid="8085867209202153403">"1 ميغابايت"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 كيلوبايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
     <item msgid="2822309747675758628">"256 كيلوبايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"تخزين مؤقت (برنامج النشاط)"</item>
     <item msgid="6652164677254579050">"تخزين مؤقت (فارغ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"أزرق مخضر"</item>
+    <item msgid="8332294763632946560">"أزرق"</item>
+    <item msgid="2023216417616991392">"نيلي"</item>
+    <item msgid="3170497246594232819">"أرجواني"</item>
+    <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 e12f721..f1d869e 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +322,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 +342,34 @@
     <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>
@@ -393,8 +413,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>
     <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>
@@ -405,7 +423,6 @@
     <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>
@@ -429,30 +446,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>
@@ -482,15 +523,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>
@@ -518,15 +552,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"إعدادات بلوتوث المتقدمة"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"عند تشغيل البلوتوث، يمكن للجهاز التواصل مع أجهزة البلوتوث الأخرى القريبة."</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 +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>
@@ -595,15 +607,11 @@
     <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>
@@ -626,6 +634,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"‏اتصال Wi-Fi مباشر"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"عرض التطبيقات"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏عرض قوة إشارة WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال بالشبكة"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"تذكر الشبكة"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"حذف الشبكة"</string>
@@ -641,7 +651,7 @@
     <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>
@@ -667,20 +677,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>
@@ -753,6 +758,23 @@
     <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="3208568886184788972">"‏وضع الاتصال عبر Wi-Fi"</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>
+    <item msgid="3132912693346866895">"‏Wi-Fi فقط"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"٢"</item>
+    <item msgid="1171822231056612021">"١"</item>
+    <item msgid="3194458950573886239">"٠"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"إيقاف"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏شبكة Wi-Fi مُفضّلة (لا يتم استخدام شبكة الجوّال إلا عند عدم توفر شبكة Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏شبكة الجوّال مُفضّلة (يتم استخدام Wi-Fi فقط عند عدم توفر شبكة الجوّال)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏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>
@@ -816,6 +838,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>
@@ -867,10 +894,14 @@
     <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>
@@ -964,7 +995,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
@@ -1009,10 +1041,16 @@
     <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="5805796658276223307">"‏سيؤدي هذا إلى إعادة تعيين جميع الإعدادات ذات الصلة بالشبكات على الإعدادات الافتراضية للمصنع:\n\n"<li>"Wifi"</li>\n<li>"بيانات الجوّال"</li>\n<li>"بلوتوث"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"إعادة تعيين الإعدادات"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"هل تريد إعادة تعيين جميع إعدادات الشبكة؟ لن تستطيع التراجع عن هذا الإجراء."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"إعادة تعيين الإعدادات"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"يلزمك رسم نقش إلغاء التأمين لتأكيد إعادة تعيين إعدادات الشبكة."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"هل تريد إعادة التعيين؟"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"تمت إعادة تعيين إعدادات الشبكة"</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>
@@ -1107,6 +1145,8 @@
     <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_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,7 +1192,7 @@
     <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="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>
@@ -1398,17 +1438,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>
@@ -1447,19 +1476,29 @@
     <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>
@@ -1563,6 +1602,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 +1744,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>
@@ -1750,7 +1796,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>
@@ -1849,12 +1895,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 +2070,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>
@@ -2228,13 +2276,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>
@@ -2285,8 +2333,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 +2399,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>
@@ -2374,6 +2424,9 @@
     <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_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"أمان أذونات التطبيقات"</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>
@@ -2418,29 +2471,39 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <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_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>
@@ -2514,4 +2577,41 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"إعادة تعيين التفضيلات عبر جميع التطبيقات إلى الإعدادات الافتراضية"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"تم تثبيت <xliff:g id="COUNT">%d</xliff:g> من التطبيقات، بما في ذلك تطبيقات النظام والتطبيقات التي تم تنزيلها"</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>
 </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 2bcb59d..01387c0 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Винаги"</item>
     <item msgid="844721238536786870">"Само при включено захранване"</item>
-    <item msgid="2990218920631468642">"Никога (увеличава използването на данни)"</item>
+    <item msgid="1986753720941888596">"Никога"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Винаги"</item>
     <item msgid="7433294150916905997">"Само при включено захранване"</item>
     <item msgid="1390404486722375028">"Никога"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Последните 30 дни"</item>
+    <item msgid="6600989128423965319">"Цикъл на пренос..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Автоматично"</item>
+    <item msgid="1013988753804838790">"Автоматично"</item>
     <item msgid="6670588712989942178">"Само на 5 GHz"</item>
     <item msgid="2715516524973207876">"Само на 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Време на употреба"</item>
-    <item msgid="3703676222230317933">"Брой стартирания"</item>
+    <item msgid="4796160515314745154">"Последно използване"</item>
     <item msgid="2502754479975776899">"Име на приложението"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"сила на звука на будилника"</item>
     <item msgid="785049718065337473">"сила на звука за известия"</item>
     <item msgid="6700305533746877052">"сила на звука за Bluetooth"</item>
-    <item msgid="3810969981743709839">"заглушаване/включване на микрофона"</item>
-    <item msgid="2627903914574908209">"оставяне в будно състояние"</item>
-    <item msgid="1395372654968157578">"наблюдение на местоположението"</item>
-    <item msgid="3238451051299611853">"наблюдение на заявките за местоположение, изразходващи много енергия"</item>
+    <item msgid="2029227495214047094">"оставяне в будно състояние"</item>
+    <item msgid="26109888160231211">"наблюдение на местоположението"</item>
+    <item msgid="5753382310468855812">"наблюдение на заявките за местоположение, изразходващи много енергия"</item>
+    <item msgid="3356591542543137332">"получаване на статистически данни за употребата"</item>
+    <item msgid="3073734345226842233">"заглушаване/включване на микрофона"</item>
+    <item msgid="1148142988678569310">"прожектиране на мултимедия"</item>
+    <item msgid="9130014005474445273">"активиране на виртуална частна мрежа (VPN)"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Сила на звука на будилника"</item>
     <item msgid="9103719301075748925">"Сила на звука при известие"</item>
     <item msgid="7025966722295861512">"Сила на звука за Bluetooth"</item>
-    <item msgid="2265317984004577529">"Заглушаване/включване на микрофона"</item>
-    <item msgid="3646325683886507917">"Оставяне в будно състояние"</item>
+    <item msgid="4665183401128289653">"Оставяне в будно състояние"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
     <item msgid="7669257279311110599">"Местоположение"</item>
-    <item msgid="7745724368696313169">"Местоположение"</item>
+    <item msgid="3459320345690097795">"Получаване на статистически данни за употребата"</item>
+    <item msgid="1312534577834048535">"Заглушаване/включване на микрофона"</item>
+    <item msgid="5906017727368097853">"Прожектиране на мултимедия"</item>
+    <item msgid="2486614710846178542">"Активиране на виртуална частна мрежа (VPN)"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Стандартни"</item>
     <item msgid="1016452621833735880">"Безсерифни"</item>
     <item msgid="2496277987934654454">"Безсерифни сбити"</item>
-    <item msgid="4406003087391086325">"Серифни"</item>
-    <item msgid="1558362802170124073">"Непропорционални"</item>
-    <item msgid="6857338041963571301">"Неформални"</item>
-    <item msgid="961716102408512888">"Курсивни"</item>
-    <item msgid="784581717183349567">"Малки главни букви"</item>
+    <item msgid="7247838127505318669">"Безсерифни непропорционални"</item>
+    <item msgid="4478414822462359763">"Серифни"</item>
+    <item msgid="7502451783483660829">"Серифни непропорционални"</item>
+    <item msgid="639503332147461010">"Неформални"</item>
+    <item msgid="7967169925231332424">"Курсивни"</item>
+    <item msgid="561832997193039673">"Малки главни букви"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Много малък"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 МБ"</item>
     <item msgid="3025431211013424097">"16 МБ"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 КБ"</item>
+    <item msgid="3534782711045262344">"256 КБ"</item>
+    <item msgid="8085867209202153403">"1 МБ"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"Рег. буфер – 64 КБ"</item>
     <item msgid="2822309747675758628">"Рег. буфер – 256 КБ"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кеширано (клиентска програма за активността)"</item>
     <item msgid="6652164677254579050">"Кеширано (празно)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"синьо-зелено"</item>
+    <item msgid="8332294763632946560">"синьо"</item>
+    <item msgid="2023216417616991392">"индиго"</item>
+    <item msgid="3170497246594232819">"лилаво"</item>
+    <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 73655e9..8148b84 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>
@@ -137,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>
@@ -156,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>
@@ -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">"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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Разширени настр. за Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Когато вкл. Bluetooth, устройството ви може да се свързва с други у-ва с Bluetooth в района."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканиране"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Разширени"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Приложения"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Сила на Wi-Fi сигнал"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Свързване с мрежа"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Запомняне на мрежата"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Забравяне на мрежа"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Режим на обаждания през Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Само Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Изкл."</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Предпочита се Wi-Fi (Използва се клетъчна мрежа само ако не е налице Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Предпочита се клетъчна мрежа (Само ако такава не е налице, се използва Wi-Fi)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Само 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Състояние на батерията"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерията"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Така всички свързани с мрежата настройки ще се нулират към стандартните им фабрични стойности, включително:\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="1745138973574945389">"Да се нулират ли всички настройки на мрежата? Не можете да отмените това действие!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Нулиране на настройките"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Трябва да начертаете фигурата си за отключване, за да потвърдите нулирането на настройките на мрежата."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Да се извърши ли нулиране?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Настройките на мрежата са нулирани"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"приложения, изтегляне, приложения, системни"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d приложения предоставят условия</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Нулиране на предпочитанията на всички приложения към стандартните им стойности"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Инсталирани са <xliff:g id="COUNT">%d</xliff:g> приложения, включително системните и изтеглените"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Разширени"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Неизвестно приложение"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Избиране на потр. профил"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-bn-rBD-nokeys/strings.xml b/res/values-bn-rBD-nokeys/strings.xml
new file mode 100644
index 0000000..15a7653
--- /dev/null
+++ b/res/values-bn-rBD-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"অ্যাপ্লিকেশানগুলি পরিচালনা করুন"</string>
+</resources>
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn-rBD/arrays.xml
index 44a37b6..c6c0664 100644
--- a/res/values-bn-rBD/arrays.xml
+++ b/res/values-bn-rBD/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"সবসময়"</item>
     <item msgid="844721238536786870">"কেবলমাত্র যখন প্লাগ ইন তখন"</item>
-    <item msgid="2990218920631468642">"কখনই নয় (বেশি ডেটা ব্যবহৃত হয়)"</item>
+    <item msgid="1986753720941888596">"কখনো নয়"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"সবসময়"</item>
     <item msgid="7433294150916905997">"কেবলমাত্র যখন প্লাগ ইন তখন"</item>
     <item msgid="1390404486722375028">"কখনই নয়"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"গত ৩০ দিন"</item>
+    <item msgid="6600989128423965319">"ব্যবহার চক্র সেট করুন..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"স্বতঃ"</item>
+    <item msgid="1013988753804838790">"স্বয়ংক্রিয়"</item>
     <item msgid="6670588712989942178">"কেবলমাত্র ৫ GHz"</item>
     <item msgid="2715516524973207876">"কেবলমাত্র ২.৪ GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ব্যবহারের সময়"</item>
-    <item msgid="3703676222230317933">"লঞ্চ গণনা"</item>
+    <item msgid="4796160515314745154">"সর্বশেষ ব্যবহার হয়েছে"</item>
     <item msgid="2502754479975776899">"অ্যাপ্লিকেশান নাম"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"অ্যালার্মের ভলিউম"</item>
     <item msgid="785049718065337473">"বিজ্ঞপ্তির ভলিউম"</item>
     <item msgid="6700305533746877052">"Bluetooth এর ভলিউম"</item>
-    <item msgid="3810969981743709839">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
-    <item msgid="2627903914574908209">"জেগে থাকুন"</item>
-    <item msgid="1395372654968157578">"অবস্থান নিরীক্ষণ করুন"</item>
-    <item msgid="3238451051299611853">"উচ্চ পাওয়ার যুক্ত অবস্থান নিরীক্ষণ করুন"</item>
+    <item msgid="2029227495214047094">"জাগিয়ে রাখা"</item>
+    <item msgid="26109888160231211">"অবস্থান নিরীক্ষণ করুন"</item>
+    <item msgid="5753382310468855812">"উচ্চ ক্ষমতার অবস্থান নিরীক্ষণ করুন"</item>
+    <item msgid="3356591542543137332">"ব্যবহারের পরিসংখ্যান পান"</item>
+    <item msgid="3073734345226842233">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
+    <item msgid="1148142988678569310">"মিডিয়া অভিক্ষেপ করুন"</item>
+    <item msgid="9130014005474445273">"VPN সক্রিয় করুন"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"অবস্থান"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"অ্যালার্মের ভলিউম"</item>
     <item msgid="9103719301075748925">"বিজ্ঞপ্তির ভলিউম"</item>
     <item msgid="7025966722295861512">"Bluetooth এর ভলিউম"</item>
-    <item msgid="2265317984004577529">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
-    <item msgid="3646325683886507917">"জেগে থাকুন"</item>
+    <item msgid="4665183401128289653">"জাগ্রত রাখুন"</item>
+    <item msgid="8584357129746649222">"অবস্থান"</item>
     <item msgid="7669257279311110599">"অবস্থান"</item>
-    <item msgid="7745724368696313169">"স্থান"</item>
+    <item msgid="3459320345690097795">"ব্যবহারের পরিসংখ্যান পান"</item>
+    <item msgid="1312534577834048535">"মাইক্রোফোন নিঃশব্দ/সশব্দ করুন"</item>
+    <item msgid="5906017727368097853">"মিডিয়া প্রক্ষেপ করুন"</item>
+    <item msgid="2486614710846178542">"VPN সক্রিয় করুন"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"স্বল্প"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ডিফল্ট"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans-serif ঘনীভূত"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Small Capitals"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"ক্যাজুয়্যাল"</item>
+    <item msgid="7967169925231332424">"কার্সিভ"</item>
+    <item msgid="561832997193039673">"Small Capitals"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"অতি ক্ষুদ্র"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"৪০০০০০০"</item>
     <item msgid="3025431211013424097">"১৬০০০০০০"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"৬৪০০০"</item>
+    <item msgid="3534782711045262344">"২৫৬০০০"</item>
+    <item msgid="8085867209202153403">"১০০০০০০"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"লগ বাফার প্রতি 64K"</item>
     <item msgid="2822309747675758628">"লগ বাফার প্রতি 256K"</item>
@@ -487,8 +502,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"বন্ধ করুন"</item>
-    <item msgid="5656544177755411222">"সীমিত বাধা"</item>
-    <item msgid="8735337502532332056">"শূন্য বাধা"</item>
+    <item msgid="5656544177755411222">"কল ও ম্যাসেজ কখন কখন আটকান"</item>
+    <item msgid="8735337502532332056">"কল ও ম্যাসেজ কখনই আটকাবেন না"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"স্বাভাবিক"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"ব্যবহৃত ক্যাশে (কার্যকলাপ ক্লায়েন্ট)"</item>
     <item msgid="6652164677254579050">"ব্যবহৃত ক্যাশে (খালি)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"টিল"</item>
+    <item msgid="8332294763632946560">"নীল"</item>
+    <item msgid="2023216417616991392">"বেগুনি নীলবর্ণ"</item>
+    <item msgid="3170497246594232819">"বেগুনি"</item>
+    <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 8379233..22cbc0d 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>
@@ -137,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>
@@ -156,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>
@@ -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">"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>
@@ -350,6 +338,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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"উন্নত Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"যখন Bluetooth চালু করা হয়, তখন আপনার অন্যান্য কাছাকাছির Bluetooth ডিভাইসগুলির সাথে যোগাযোগ করতে পারে৷"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi ডাইরেক্ট"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"স্ক্যান করুন"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"উন্নত"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"অ্যাপ্লিকেশানগুলি দেখান"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi এর শক্তি দেখান"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"নেটওয়ার্কের সাথে সংযোগ করুন"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"নেটওয়ার্ক মনে রাখুন"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"নেটওয়ার্ক ভুলে যান"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi কলিং মোড"</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>
+    <item msgid="3132912693346866895">"শুধুমাত্র Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"২"</item>
+    <item msgid="1171822231056612021">"১"</item>
+    <item msgid="3194458950573886239">"০"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"বন্ধ আছে"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi পছন্দের (শুধুমাত্র Wi-Fi উপলব্ধ না থাকলে মোবাইল নেটওয়ার্ক ব্যবহার করে)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"সেলুলার পছন্দের (শুধুমাত্র মোবাইল নেটওয়ার্ক উপলব্ধ না থাকলে Wi-Fi ব্যবহার করে)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"শুধুমাত্র 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ব্যাটারি স্থিতি"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ব্যাটারি স্তর"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"এটি নেটওয়াকিং এর সাথে সম্পর্কিত সমস্ত সেটিংস কে ফ্যাক্টরী ডিফল্টে পুনরায় সেট করবে, এগুলি সমেত:\n\n"<li>"Wifi"</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="1745138973574945389">"সমস্ত নেটওয়ার্ক সেটিংস পুনরায় সেট করবেন? আপনি পদক্ষেপটি আর বাতিল করতে পারবেন না!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"সেটিংস পুনরায় সেট করুন"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"একটি নেটওয়ার্ক সেটিংস পুনরায় সেট করা নিশ্চিত করতে আপনাকে আপনার আনলক প্যাটার্ন অঙ্কন করতে হবে৷"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"পুনরায় সেট করবেন?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"নেটওয়ার্ক সেটিংস পুনরায় সেট করা"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"অ্যাপ্লিকেশানগুলি ডাউনলোড করার অ্যাপ্লিকেশান সিস্টেম"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"অ্যাপ্লিকেশান অনুমতিগুলির নিরাপত্তা"</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>
@@ -2418,27 +2435,31 @@
     <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) -->
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%dটি অ্যাপ্লিকেশান শর্তগুলি প্রদান করে</item>
+      <item quantity="other">%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>
@@ -2512,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"সমস্ত অ্যাপ্লিকেশান জুড়ে পছন্দগুলিকে ডিফল্ট অনুযায়ী পুনরায় সেট করুন"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g>টি অ্যাপ্লিকেশান ইনস্টল করা হয়েছে, সিস্টেমের এবং ডাউনলোড করা অ্যাপ্লিকেশানগুলি অন্তর্ভুক্ত রয়েছে"</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>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 3e38b16..02fc0fa 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
     <item msgid="844721238536786870">"Només quan s\'estigui carregant"</item>
-    <item msgid="2990218920631468642">"Mai (augmenta l\'ús de dades)"</item>
+    <item msgid="1986753720941888596">"Mai"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
     <item msgid="7433294150916905997">"Només quan s\'estigui carregant"</item>
     <item msgid="1390404486722375028">"Mai"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Els darrers 30 dies"</item>
+    <item msgid="6600989128423965319">"Defineix el cicle d\'ús..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automàtic"</item>
+    <item msgid="1013988753804838790">"Automàtica"</item>
     <item msgid="6670588712989942178">"Només 5 GHz"</item>
     <item msgid="2715516524973207876">"Només 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Temps d\'ús"</item>
-    <item msgid="3703676222230317933">"Inicia el recompte"</item>
+    <item msgid="4796160515314745154">"Darrera vegada que es va fer servir"</item>
     <item msgid="2502754479975776899">"Nom de l\'aplicació"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volum de l\'alarma"</item>
     <item msgid="785049718065337473">"volum de notificació"</item>
     <item msgid="6700305533746877052">"volum del Bluetooth"</item>
-    <item msgid="3810969981743709839">"silenciar/no silenciar el micròfon"</item>
-    <item msgid="2627903914574908209">"mantenir-los actius"</item>
-    <item msgid="1395372654968157578">"seguiment de la ubicació"</item>
-    <item msgid="3238451051299611853">"seguiment de la precisió de la ubicació"</item>
+    <item msgid="2029227495214047094">"actiu"</item>
+    <item msgid="26109888160231211">"supervisa la ubicació"</item>
+    <item msgid="5753382310468855812">"fes un seguiment de la precisió de la ubicació"</item>
+    <item msgid="3356591542543137332">"obtenir estadístiques d\'ús"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicació"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volum de l\'alarma"</item>
     <item msgid="9103719301075748925">"Volum de notificació"</item>
     <item msgid="7025966722295861512">"Volum de Bluetooth"</item>
-    <item msgid="2265317984004577529">"Silenciar/no silenciar el micròfon"</item>
-    <item msgid="3646325683886507917">"Mantenir-los actius"</item>
+    <item msgid="4665183401128289653">"Actiu"</item>
+    <item msgid="8584357129746649222">"Ubicació"</item>
     <item msgid="7669257279311110599">"Ubicació"</item>
-    <item msgid="7745724368696313169">"Ubicació"</item>
+    <item msgid="3459320345690097795">"Obtenir estadístiques d\'ús"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predeterminat"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensada"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monoespaiada"</item>
-    <item msgid="6857338041963571301">"Informal"</item>
-    <item msgid="961716102408512888">"Cursiva"</item>
-    <item msgid="784581717183349567">"Versaletes"</item>
+    <item msgid="7247838127505318669">"Sans serif monoespaiada"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monoespaiada"</item>
+    <item msgid="639503332147461010">"Informal"</item>
+    <item msgid="7967169925231332424">"Cursiva"</item>
+    <item msgid="561832997193039673">"Versaletes"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Molt petit"</item>
@@ -375,6 +385,11 @@
     <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.000"</item>
+    <item msgid="3534782711045262344">"256.000"</item>
+    <item msgid="8085867209202153403">"1.000.000"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 K/memòria cau reg."</item>
     <item msgid="2822309747675758628">"256 K/memòria cau reg."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"A la memòria cau (client de l\'activitat)"</item>
     <item msgid="6652164677254579050">"A la memòria cau (buit)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verd blavós"</item>
+    <item msgid="8332294763632946560">"Blau"</item>
+    <item msgid="2023216417616991392">"Anyil"</item>
+    <item msgid="3170497246594232819">"Porpra"</item>
+    <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 ef25eb7..6903352 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostra aplicacions"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostra senyal Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connecta\'t a la xarxa"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Recorda la xarxa"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esborra la xarxa"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Mode de trucades per Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Només Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desactivada"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferència per la Wi-Fi (es fa servir la xarxa mòbil només si la Wi-Fi no està disponible)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferència per les dades mòbils (només es fa servir la Wi-Fi si la xarxa mòbil no està disponible)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Només Wi-Fi (no s\'utilitza mai la xarxa mòbil; no es poden fer ni rebre trucades si no hi ha Wi-Fi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Estat de la bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivell de la bateria"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Es restabliran els valors de fàbrica de tota la configuració relacionada amb les xarxes, com ara el següent:\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="1745138973574945389">"Vols restablir tota la configuració de la xarxa? No podràs desfer aquesta acció."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restableix la configuració"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de la configuració de la xarxa."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vols restablir-la?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"aplicacions baixada aplicacions sistema"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplicacions proporcionen condicions</item>
+      <item quantity="one">%d aplicació proporciona 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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Restableix els valors predeterminats de les preferències en totes les aplicacions"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"S\'han instal·lat <xliff:g id="COUNT">%d</xliff:g> aplicacions, incloses les aplicacions del sistema i les baixades"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index fffa07a..ebac1ed 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -88,7 +88,7 @@
     <item msgid="8934131797783724664">"Vyhledávání..."</item>
     <item msgid="8513729475867537913">"Připojování..."</item>
     <item msgid="515055375277271756">"Ověřování..."</item>
-    <item msgid="1943354004029184381">"Načítání adresy IP…"</item>
+    <item msgid="1943354004029184381">"Načítání IP adresy…"</item>
     <item msgid="4221763391123233270">"Připojeno"</item>
     <item msgid="624838831631122137">"Pozastaveno"</item>
     <item msgid="7979680559596111948">"Odpojování..."</item>
@@ -102,7 +102,7 @@
     <item msgid="8878186979715711006">"Vyhledávání..."</item>
     <item msgid="355508996603873860">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="554971459996405634">"Ověřování v síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="7928343808033020343">"Získávání adresy IP ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Získávání IP adresy ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="8937994881315223448">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"Pozastaveno"</item>
     <item msgid="7698638434317271902">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Vždy"</item>
     <item msgid="844721238536786870">"Pouze při nabíjení"</item>
-    <item msgid="2990218920631468642">"Nikdy (zvyšuje využití dat)"</item>
+    <item msgid="1986753720941888596">"Nikdy"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Vždy"</item>
     <item msgid="7433294150916905997">"Pouze při nabíjení"</item>
     <item msgid="1390404486722375028">"Nikdy"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Posledních 30 dní"</item>
+    <item msgid="6600989128423965319">"Zadat cyklus počítání..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automaticky"</item>
+    <item msgid="1013988753804838790">"Automatické"</item>
     <item msgid="6670588712989942178">"Pouze 5 GHz"</item>
     <item msgid="2715516524973207876">"Pouze 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Doba použití"</item>
-    <item msgid="3703676222230317933">"Počet spuštění"</item>
+    <item msgid="4796160515314745154">"Naposledy použito"</item>
     <item msgid="2502754479975776899">"Název aplikace"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"hlasitost budíku"</item>
     <item msgid="785049718065337473">"hlasitost oznámení"</item>
     <item msgid="6700305533746877052">"hlasitost Bluetooth"</item>
-    <item msgid="3810969981743709839">"vypnout nebo zapnout zvuk mikrofonu"</item>
-    <item msgid="2627903914574908209">"zakázat režim spánku"</item>
-    <item msgid="1395372654968157578">"sledovat polohu"</item>
-    <item msgid="3238451051299611853">"sledovat energeticky náročné určování polohy"</item>
+    <item msgid="2029227495214047094">"Zakázat režim spánku"</item>
+    <item msgid="26109888160231211">"sledovat polohu"</item>
+    <item msgid="5753382310468855812">"sledování energeticky náročného určování polohy"</item>
+    <item msgid="3356591542543137332">"načíst statistiky využití"</item>
+    <item msgid="3073734345226842233">"vypnout nebo zapnout zvuk mikrofonu"</item>
+    <item msgid="1148142988678569310">"promítat média"</item>
+    <item msgid="9130014005474445273">"aktivovat VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Hlasitost budíku"</item>
     <item msgid="9103719301075748925">"Hlasitost oznámení"</item>
     <item msgid="7025966722295861512">"Hlasitost Bluetooth"</item>
-    <item msgid="2265317984004577529">"Vypnout nebo zapnout zvuk mikrofonu"</item>
-    <item msgid="3646325683886507917">"Zakázat režim spánku"</item>
+    <item msgid="4665183401128289653">"Zakázat režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
     <item msgid="7669257279311110599">"Určování polohy"</item>
-    <item msgid="7745724368696313169">"Poloha"</item>
+    <item msgid="3459320345690097795">"Načíst statistiky využití"</item>
+    <item msgid="1312534577834048535">"Vypnout nebo zapnout zvuk mikrofonu"</item>
+    <item msgid="5906017727368097853">"Promítat média"</item>
+    <item msgid="2486614710846178542">"Aktivovat VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátká"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Výchozí"</item>
     <item msgid="1016452621833735880">"Bezpatkové"</item>
     <item msgid="2496277987934654454">"Bezpatkové zúžené"</item>
-    <item msgid="4406003087391086325">"Patkové"</item>
-    <item msgid="1558362802170124073">"Neproporcionální"</item>
-    <item msgid="6857338041963571301">"Neformální"</item>
-    <item msgid="961716102408512888">"Kurzíva"</item>
-    <item msgid="784581717183349567">"Kapitálky"</item>
+    <item msgid="7247838127505318669">"Bezpatkové neproporcionální"</item>
+    <item msgid="4478414822462359763">"Patkové"</item>
+    <item msgid="7502451783483660829">"Patkové neproporcionální"</item>
+    <item msgid="639503332147461010">"Neformální"</item>
+    <item msgid="7967169925231332424">"Kurzíva"</item>
+    <item msgid="561832997193039673">"Kapitálky"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Velmi malé"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100 %"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Použít výchozí nastavení aplikace"</item>
+    <item msgid="7009918361545506251">"Použít výchozí"</item>
     <item msgid="1770533843436933500">"Bílé na černém"</item>
     <item msgid="758587126802411846">"Černé na bílém"</item>
     <item msgid="1495307195241623402">"Žluté na černém"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 kB na vyrovnávací paměť protokolů"</item>
     <item msgid="2822309747675758628">"256 kB na vyrovnávací paměť protokolů"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"V mezipaměti (klient aktivity)"</item>
     <item msgid="6652164677254579050">"V mezipaměti (prázdné)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Šedozelená"</item>
+    <item msgid="8332294763632946560">"Modrá"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Nachová"</item>
+    <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 764b1fe..bf49f78 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +320,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>
@@ -350,6 +340,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>
@@ -393,8 +409,6 @@
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhledávání"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšířené nastavení"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Zobrazit aplikace"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Zobrazit sílu Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamatovat síť"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"Režim volání přes Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Pouze Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Vypnuto"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferována síť Wi-Fi (mobilní síť bude použita jen v případě nedostupnosti sítě Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferována mobilní síť (síť Wi-Fi bude použita jen v případě nedostupnosti mobilní sítě)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Pouze Wi-Fi (mobilní síť se nepoužívá; je-li Wi-Fi nedostupná, nelze provádět ani přijímat hovory)"</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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav baterie"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"Touto akcí resetujete do výchozího továrního nastavení všechna nastavení související se sítěmi, včetně těchto:\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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Chcete-li potvrdit resetování nastavení sítě, musíte nakreslit bezpečnostní gesto."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovat?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Resetování nastavení sítě"</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>
@@ -1107,6 +1127,8 @@
     <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="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_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>
@@ -1152,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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>
@@ -1704,14 +1726,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>
@@ -1750,7 +1778,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>
@@ -1849,12 +1877,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>
@@ -2026,6 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_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_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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="few">Aplikace poskytující podmínky: %d</item>
+      <item quantity="many">Aplikace poskytující podmínky: %d</item>
+      <item quantity="other">Aplikace poskytující podmínky: %d</item>
+      <item quantity="one">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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Resetovat předvolby ve všech aplikacích do výchozího nastavení"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Počet nainstalovaných aplikací včetně systémových a stažených aplikací: <xliff:g id="COUNT">%d</xliff:g>"</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>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 65a4964..ebf4d75 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -90,7 +90,7 @@
     <item msgid="515055375277271756">"Godkender..."</item>
     <item msgid="1943354004029184381">"Henter IP-adresse…"</item>
     <item msgid="4221763391123233270">"Tilsluttet"</item>
-    <item msgid="624838831631122137">"Midlertidigt standset"</item>
+    <item msgid="624838831631122137">"Sat på pause"</item>
     <item msgid="7979680559596111948">"Afbryder ..."</item>
     <item msgid="1634960474403853625">"Afbrudt"</item>
     <item msgid="746097431216080650">"Mislykkedes"</item>
@@ -104,7 +104,7 @@
     <item msgid="554971459996405634">"Godkender med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="7928343808033020343">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="8937994881315223448">"Forbundet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
-    <item msgid="1330262655415760617">"Midlertidigt standset"</item>
+    <item msgid="1330262655415760617">"Sat på pause"</item>
     <item msgid="7698638434317271902">"Afbryder fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
     <item msgid="197508606402264311">"Afbrudt"</item>
     <item msgid="8578370891960825148">"Mislykkedes"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Altid"</item>
     <item msgid="844721238536786870">"Kun når tilsluttet strøm"</item>
-    <item msgid="2990218920631468642">"Aldrig (øger dataforbrug)"</item>
+    <item msgid="1986753720941888596">"Aldrig"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Altid"</item>
     <item msgid="7433294150916905997">"Kun når tilsluttet strøm"</item>
     <item msgid="1390404486722375028">"Aldrig"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"De seneste 30 dage"</item>
+    <item msgid="6600989128423965319">"Angiv cyklus for brug..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatisk"</item>
+    <item msgid="1013988753804838790">"Automatisk"</item>
     <item msgid="6670588712989942178">"Kun 5 GHz"</item>
     <item msgid="2715516524973207876">"Kun 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Brugstid"</item>
-    <item msgid="3703676222230317933">"Start optælling"</item>
+    <item msgid="4796160515314745154">"Sidst anvendt"</item>
     <item msgid="2502754479975776899">"Navn på app"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarmlydstyrke"</item>
     <item msgid="785049718065337473">"lydstyrke for underretninger"</item>
     <item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
-    <item msgid="3810969981743709839">"slå mikrofonlyd til/fra"</item>
-    <item msgid="2627903914574908209">"hold aktiv"</item>
-    <item msgid="1395372654968157578">"overvåg placering"</item>
-    <item msgid="3238451051299611853">"overvåg placering med højt strømforbrug"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåg placering"</item>
+    <item msgid="5753382310468855812">"overvåg placering med højt strømforbrug"</item>
+    <item msgid="3356591542543137332">"hent brugsstatistik"</item>
+    <item msgid="3073734345226842233">"slå mikrofonlyd til/fra"</item>
+    <item msgid="1148142988678569310">"medieprojektion"</item>
+    <item msgid="9130014005474445273">"aktivér VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Placering"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarmlydstyrke"</item>
     <item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
     <item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
-    <item msgid="2265317984004577529">"Slå mikrofonlyd til/fra"</item>
-    <item msgid="3646325683886507917">"Hold aktiv"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Placering"</item>
     <item msgid="7669257279311110599">"Placering"</item>
-    <item msgid="7745724368696313169">"Placering"</item>
+    <item msgid="3459320345690097795">"Hent brugsstatistik"</item>
+    <item msgid="1312534577834048535">"Slå mikrofonlyd til/fra"</item>
+    <item msgid="5906017727368097853">"Medieprojektion"</item>
+    <item msgid="2486614710846178542">"Aktivér VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Standard"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif, kondenseret"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Enkelt tegnafstand"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Kursiv"</item>
-    <item msgid="784581717183349567">"Små versaler"</item>
+    <item msgid="7247838127505318669">"Sans-serif, enkelt tegnafstand"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif, enkelt tegnafstand"</item>
+    <item msgid="639503332147461010">"Uformel"</item>
+    <item msgid="7967169925231332424">"Kursiv"</item>
+    <item msgid="561832997193039673">"Små versaler"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Meget lille"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 KB pr. logbuffer"</item>
     <item msgid="2822309747675758628">"256 KB pr. logbuffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Cachelagret (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Cachelagret (tom)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkis"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <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 3f7e41a..2fcca77 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,30 @@
     <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="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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Søg"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanceret"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Vis apps"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Vis Wi-Fi-signal"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Husk netværket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glem netværk"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Tilstanden Opkald via Wi-Fi."</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>
+    <item msgid="3132912693346866895">"Kun Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Fra"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi er foretrukket (Bruger kun mobilnetværk, hvis Wi-Fi ikke er tilgængeligt)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilnetværk er foretrukket (Bruger Wi-Fi, hvis mobilnetværk ikke er tilgængeligt)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Kun Wi-Fi (Bruger aldrig mobilnetværk. Det er ikke muligt at foretage/modtage opkald uden Wi-Fi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteriniveau"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Dette vil nulstille alle netværksrelaterede indstillinger til fabriksstandarderne, 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="1745138973574945389">"Vil du nulstille alle netværksindstillinger? Du kan ikke fortryde denne handling."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nulstil indstillinger"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Du skal tegne dit oplåsningsmønster for at bekræfte, at du vil nulstille netværksindstillingerne."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du nulstille?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Nulstil netværksindstillinger"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,20 @@
     <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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"system til download af applikationer"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d apps angiver betingelser</item>
+      <item quantity="other">%d apps angiver 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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Nulstil præferencer i alle apps til standarderne"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps er installeret, herunder systemapps og downloadede apps"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 481e8ff..f6a3f66 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Immer"</item>
     <item msgid="844721238536786870">"Nur wenn angeschlossen"</item>
-    <item msgid="2990218920631468642">"Nie (erhöht den Datenverbrauch)"</item>
+    <item msgid="1986753720941888596">"Nie"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Immer"</item>
     <item msgid="7433294150916905997">"Nur wenn angeschlossen"</item>
     <item msgid="1390404486722375028">"Nie"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Letzte 30 Tage"</item>
+    <item msgid="6600989128423965319">"Nutzungszyklus wählen…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatisch"</item>
+    <item msgid="1013988753804838790">"Automatisch"</item>
     <item msgid="6670588712989942178">"Nur 5 GHz"</item>
     <item msgid="2715516524973207876">"Nur 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Nutzungszeit"</item>
-    <item msgid="3703676222230317933">"Startzähler"</item>
+    <item msgid="4796160515314745154">"Zuletzt verwendet"</item>
     <item msgid="2502754479975776899">"App-Name"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"Weckerlautstärke"</item>
     <item msgid="785049718065337473">"Benachrichtigungslautstärke"</item>
     <item msgid="6700305533746877052">"Bluetooth-Lautstärke"</item>
-    <item msgid="3810969981743709839">"Mikrofon ausschalten/einschalten"</item>
-    <item msgid="2627903914574908209">"aktiv lassen"</item>
-    <item msgid="1395372654968157578">"Standort überwachen"</item>
-    <item msgid="3238451051299611853">"Standorte mit hohem Stromverbrauch überwachen"</item>
+    <item msgid="2029227495214047094">"aktiv lassen"</item>
+    <item msgid="26109888160231211">"Standort beobachten"</item>
+    <item msgid="5753382310468855812">"Orte mit hohem Stromverbrauch überwachen"</item>
+    <item msgid="3356591542543137332">"Nutzungsstatistiken abrufen"</item>
+    <item msgid="3073734345226842233">"Mikrofon aus- oder einschalten"</item>
+    <item msgid="1148142988678569310">"Projektion von Medieninhalten"</item>
+    <item msgid="9130014005474445273">"VPN aktivieren"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Standort"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Weckerlautstärke"</item>
     <item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
     <item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
-    <item msgid="2265317984004577529">"Mikrofon ausschalten oder einschalten"</item>
-    <item msgid="3646325683886507917">"Aktiv lassen"</item>
+    <item msgid="4665183401128289653">"Aktiv lassen"</item>
+    <item msgid="8584357129746649222">"Standort"</item>
     <item msgid="7669257279311110599">"Ort"</item>
-    <item msgid="7745724368696313169">"Standort"</item>
+    <item msgid="3459320345690097795">"Nutzungsstatistiken abrufen"</item>
+    <item msgid="1312534577834048535">"Mikrofon aus- oder einschalten"</item>
+    <item msgid="5906017727368097853">"Projektion von Medieninhalten"</item>
+    <item msgid="2486614710846178542">"VPN aktivieren"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Standard"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif, schmal"</item>
-    <item msgid="4406003087391086325">"Serife"</item>
-    <item msgid="1558362802170124073">"Festbreitenschrift"</item>
-    <item msgid="6857338041963571301">"Gelegenheitsspiele"</item>
-    <item msgid="961716102408512888">"Kursiv"</item>
-    <item msgid="784581717183349567">"Kapitälchen"</item>
+    <item msgid="7247838127505318669">"Sans Serif mit Festbreite"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif mit Festbreite"</item>
+    <item msgid="639503332147461010">"Casual"</item>
+    <item msgid="7967169925231332424">"Kursiv"</item>
+    <item msgid="561832997193039673">"Kapitälchen"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Sehr klein"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 Mio."</item>
     <item msgid="3025431211013424097">"16 Mio."</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64.000"</item>
+    <item msgid="3534782711045262344">"256.000"</item>
+    <item msgid="8085867209202153403">"1 Mio."</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64.000 pro Puffer"</item>
     <item msgid="2822309747675758628">"256.000 pro Puffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Im Cache gespeichert (Aktivitätsclient)"</item>
     <item msgid="6652164677254579050">"Im Cache gespeichert (leer)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blaugrün"</item>
+    <item msgid="8332294763632946560">"Blau"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <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 c959216..26a414a 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -483,15 +492,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>
@@ -519,15 +521,6 @@
     <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="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>
@@ -540,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>
@@ -596,15 +576,11 @@
     <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>
@@ -627,6 +603,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Erweitert"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Apps anzeigen"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WLAN-Stärke anzeigen"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Netzwerk speichern"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netzwerk entfernen"</string>
@@ -642,7 +620,7 @@
     <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>
@@ -668,20 +646,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>
@@ -754,6 +727,23 @@
     <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="3208568886184788972">"WLAN-Anrufmodus"</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>
+    <item msgid="3132912693346866895">"Nur WLAN"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Aus"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"WLAN bevorzugt (Mobilfunk wird nur verwendet, wenn kein WLAN verfügbar ist)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilfunk bevorzugt (WLAN wird nur verwendet, wenn kein Mobilfunknetz verfügbar ist)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Nur WLAN (Mobilfunk wird nie verwendet, Anruffunktion ohne WLAN-Verbindung nicht verfügbar)"</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>
@@ -817,6 +807,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>
@@ -868,10 +863,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>
@@ -965,7 +960,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkuladung"</string>
@@ -1010,10 +1006,16 @@
     <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="5805796658276223307">"Dadurch werden alle netzwerkbezogenen Einstellungen auf die Werkseinstellungen zurückgesetzt, u. a. diese:\n\n"<li>"WLAN"</li>\n<li>"Mobiler Datenverkehr"</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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Zeichnen Sie Ihr Entsperrungsmuster, um ein Zurücksetzen der Netzwerkeinstellungen zu bestätigen."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zurücksetzen?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Netzwerkeinstellungen 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>
@@ -1108,6 +1110,8 @@
     <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="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_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>
@@ -1153,7 +1157,7 @@
     <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="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>
@@ -1399,17 +1403,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>
@@ -1448,19 +1441,29 @@
     <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>
@@ -1564,6 +1567,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>
@@ -1705,14 +1709,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>
@@ -1751,7 +1761,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>
@@ -1850,12 +1860,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>
@@ -2027,6 +2035,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>
@@ -2229,13 +2241,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>
@@ -2286,8 +2298,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>
@@ -2352,13 +2364,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>
@@ -2375,6 +2389,9 @@
     <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_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_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>
@@ -2419,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d Apps enthalten Bedingungen</item>
+      <item quantity="one">%d App enthält 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>
@@ -2515,4 +2534,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Einstellungen für alle Apps auf Standard zurücksetzen"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> Apps installiert, einschließlich System-Apps und heruntergeladener Apps"</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>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 94cefbe..630b919 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Πάντα"</item>
     <item msgid="844721238536786870">"Μόνο όταν είναι συνδεδεμένο"</item>
-    <item msgid="2990218920631468642">"Ποτέ (αύξηση χρήσης δεδομένων)"</item>
+    <item msgid="1986753720941888596">"Ποτέ"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Πάντα"</item>
     <item msgid="7433294150916905997">"Μόνο όταν είναι συνδεδεμένο"</item>
     <item msgid="1390404486722375028">"Ποτέ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 τελευταίες ημέρες"</item>
+    <item msgid="6600989128423965319">"Ορισμός κύκλου χρήσης…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Αυτόματο"</item>
+    <item msgid="1013988753804838790">"Αυτόματα"</item>
     <item msgid="6670588712989942178">"Μόνο 5 GHz"</item>
     <item msgid="2715516524973207876">"Μόνο 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Χρόνος χρήσης"</item>
-    <item msgid="3703676222230317933">"Εκκίνηση καταμέτρησης"</item>
+    <item msgid="4796160515314745154">"Τελευταία χρήση"</item>
     <item msgid="2502754479975776899">"Όνομα εφαρμογής"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"ένταση ήχου ξυπνητηριού"</item>
     <item msgid="785049718065337473">"ένταση ήχου ειδοποιήσεων"</item>
     <item msgid="6700305533746877052">"ένταση ήχου Bluetooth"</item>
-    <item msgid="3810969981743709839">"σίγαση/κατάργηση σίγασης μικροφώνου"</item>
-    <item msgid="2627903914574908209">"διατήρηση λειτουργίας"</item>
-    <item msgid="1395372654968157578">"παρακολούθηση τοποθεσίας"</item>
-    <item msgid="3238451051299611853">"παρακολούθηση θέσης υψηλής ισχύος"</item>
+    <item msgid="2029227495214047094">"διατήρηση λειτουργίας"</item>
+    <item msgid="26109888160231211">"παρακολούθηση τοποθεσίας"</item>
+    <item msgid="5753382310468855812">"παρακολούθηση θέσης υψηλής ισχύος"</item>
+    <item msgid="3356591542543137332">"λήψη στατιστικών στοιχείων χρήσης"</item>
+    <item msgid="3073734345226842233">"σίγαση/κατάργηση σίγασης μικροφώνου"</item>
+    <item msgid="1148142988678569310">"προβολή μέσου"</item>
+    <item msgid="9130014005474445273">"ενεργοποίηση VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Τοποθεσία"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Ένταση ήχου ξυπνητηριού"</item>
     <item msgid="9103719301075748925">"Ένταση ήχου ειδοποιήσεων"</item>
     <item msgid="7025966722295861512">"Ένταση ήχου Bluetooth"</item>
-    <item msgid="2265317984004577529">"Σίγαση/κατάργηση σίγασης μικροφώνου"</item>
-    <item msgid="3646325683886507917">"Διατήρηση λειτουργίας"</item>
+    <item msgid="4665183401128289653">"Διατήρηση λειτουργίας"</item>
+    <item msgid="8584357129746649222">"Τοποθεσία"</item>
     <item msgid="7669257279311110599">"Τοποθεσία"</item>
-    <item msgid="7745724368696313169">"Τοποθεσία"</item>
+    <item msgid="3459320345690097795">"Λήψη στατιστικών στοιχείων χρήσης"</item>
+    <item msgid="1312534577834048535">"Σίγαση/κατάργηση σίγασης μικροφώνου"</item>
+    <item msgid="5906017727368097853">"Προβολή μέσου"</item>
+    <item msgid="2486614710846178542">"Ενεργοποίηση VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Προεπιλογή"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Απλά"</item>
-    <item msgid="961716102408512888">"Λοξά"</item>
-    <item msgid="784581717183349567">"Μικρά κεφαλαία"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Απλά"</item>
+    <item msgid="7967169925231332424">"Λοξά"</item>
+    <item msgid="561832997193039673">"Μικρά κεφαλαία"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Πολύ μικρό"</item>
@@ -375,6 +385,11 @@
     <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 ανά μεγ.πρ.μν.καταγρ."</item>
     <item msgid="2822309747675758628">"256 K ανά μεγ.πρ.μν.καταγρ."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα πελάτη)"</item>
     <item msgid="6652164677254579050">"Αποθηκευμένο στην κρυφή μνήμη (κενό)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Γαλαζοπράσινο"</item>
+    <item msgid="8332294763632946560">"Μπλε"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Μοβ"</item>
+    <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 ab0186c..674a63b 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ΟΚ"</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>
@@ -393,8 +405,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">"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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Προηγμένες ρυθμίσεις Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Eνεργοποιήστε το Bluetooth."</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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Σάρωση"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Σύνθετα"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Εμφάνιση εφαρμογών"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Εμφάνιση ισχύος WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Υπενθύμιση δικτύου"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Διαγραφή δικτύου από τη μνήμη"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Λειτουργία κλήσης Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Μόνο Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Ανενεργό"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Προτίμηση Wi-Fi (Χρησιμοποιεί δίκτυο κινητής τηλεφωνίας μόνο εάν δεν υπάρχει διαθέσιμο Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Προτίμηση δικτύου κινητής τηλεφωνίας (Χρήση Wi-Fi μόνο αν δεν υπάρχει δίκτυο κινητής τηλεφωνίας)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Μόνο 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Επίπεδο μπαταρίας"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Αυτό θα επαναφέρει όλες τις ρυθμίσεις που σχετίζονται με τα δίκτυα στις εργοστασιακές προεπιλογές, συμπεριλαμβανομένων:\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="1745138973574945389">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν είναι δυνατή η αναίρεση αυτής της ενέργειας!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Επαναφορά ρυθμίσεων"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την επαναφορά των ρυθμίσεων δικτύου."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Να γίνει επαναφορά;"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Έγινε επαναφορά των ρυθμίσεων δικτύου"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2353,13 +2365,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>
@@ -2376,6 +2390,9 @@
     <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_all_apps" msgid="5377153522551809915">"εφαρμογές λήψη εφαρμογές σύστημα"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ασφάλεια δικαιωμάτων εφαρμογών"</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>
@@ -2420,29 +2437,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d εφαρμογές παρέχουν συνθήκες</item>
+      <item quantity="one">%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>
@@ -2516,4 +2535,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Επαναφορά προεπιλεγμένων προτιμήσεων σε όλες τις εφαρμογές"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Εγκαταστάθηκαν <xliff:g id="COUNT">%d</xliff:g> εφαρμογές, συμπεριλαμβανομένων των εφαρμογών συστήματος και των λήψεων εφαρμογών"</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>
 </resources>
diff --git a/res/xml/quick_launch_settings.xml b/res/values-en-rAU-nokeys/strings.xml
similarity index 61%
copy from res/xml/quick_launch_settings.xml
copy to res/values-en-rAU-nokeys/strings.xml
index eb5585c..05263e9 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/values-en-rAU-nokeys/strings.xml
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
+ -->
 
-<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>   
+<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..f8fc08c
--- /dev/null
+++ b/res/values-en-rAU/arrays.xml
@@ -0,0 +1,545 @@
+<?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>
+  </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>
+  </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>
+  </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="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>
+    <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
index 802ab0c..cb83480 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <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_apps" msgid="6003687912727859577">"Show Apps"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Show Wi-Fi Strength"</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>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi Calling mode"</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>
+    <item msgid="3132912693346866895">"Wi-Fi only"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Off"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferred (Uses mobile network only if Wi-Fi isn\'t available)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile preferred (Uses Wi-Fi only if mobile network isn\'t available)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi only (Never uses mobile network. Can\'t make or receive calls if Wi-Fi isn\'t available)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"This will reset all settings related to networking to the factory defaults, 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="1745138973574945389">"Reset all network settings? You can\'t reverse this action!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"You need to draw your unlock pattern to confirm a network settings reset."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Network settings 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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d apps provide conditions</item>
+      <item quantity="one">%d app provides 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Reset preferences across all apps to defaults"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</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>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 96d06ba..f8fc08c 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Always"</item>
     <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="2990218920631468642">"Never (increases data usage)"</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="624340809384223320">"Auto"</item>
+    <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="3703676222230317933">"Launch count"</item>
+    <item msgid="4796160515314745154">"Last time used"</item>
     <item msgid="2502754479975776899">"App name"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarm volume"</item>
     <item msgid="785049718065337473">"notification volume"</item>
     <item msgid="6700305533746877052">"Bluetooth volume"</item>
-    <item msgid="3810969981743709839">"mute/unmute microphone"</item>
-    <item msgid="2627903914574908209">"keep awake"</item>
-    <item msgid="1395372654968157578">"monitor location"</item>
-    <item msgid="3238451051299611853">"monitor high power location"</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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Location"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarm volume"</item>
     <item msgid="9103719301075748925">"Notification volume"</item>
     <item msgid="7025966722295861512">"Bluetooth volume"</item>
-    <item msgid="2265317984004577529">"Mute/unmute microphone"</item>
-    <item msgid="3646325683886507917">"Keep awake"</item>
+    <item msgid="4665183401128289653">"Keep awake"</item>
+    <item msgid="8584357129746649222">"Location"</item>
     <item msgid="7669257279311110599">"Location"</item>
-    <item msgid="7745724368696313169">"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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Default"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Small capitals"</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>
@@ -375,6 +385,11 @@
     <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>
@@ -512,4 +527,19 @@
     <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-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 802ab0c..cb83480 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <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_apps" msgid="6003687912727859577">"Show Apps"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Show Wi-Fi Strength"</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>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi Calling mode"</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>
+    <item msgid="3132912693346866895">"Wi-Fi only"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Off"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferred (Uses mobile network only if Wi-Fi isn\'t available)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile preferred (Uses Wi-Fi only if mobile network isn\'t available)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi only (Never uses mobile network. Can\'t make or receive calls if Wi-Fi isn\'t available)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"This will reset all settings related to networking to the factory defaults, 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="1745138973574945389">"Reset all network settings? You can\'t reverse this action!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"You need to draw your unlock pattern to confirm a network settings reset."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Network settings 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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d apps provide conditions</item>
+      <item quantity="one">%d app provides 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Reset preferences across all apps to defaults"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</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>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 96d06ba..f8fc08c 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Always"</item>
     <item msgid="844721238536786870">"Only when plugged in"</item>
-    <item msgid="2990218920631468642">"Never (increases data usage)"</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="624340809384223320">"Auto"</item>
+    <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="3703676222230317933">"Launch count"</item>
+    <item msgid="4796160515314745154">"Last time used"</item>
     <item msgid="2502754479975776899">"App name"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarm volume"</item>
     <item msgid="785049718065337473">"notification volume"</item>
     <item msgid="6700305533746877052">"Bluetooth volume"</item>
-    <item msgid="3810969981743709839">"mute/unmute microphone"</item>
-    <item msgid="2627903914574908209">"keep awake"</item>
-    <item msgid="1395372654968157578">"monitor location"</item>
-    <item msgid="3238451051299611853">"monitor high power location"</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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Location"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarm volume"</item>
     <item msgid="9103719301075748925">"Notification volume"</item>
     <item msgid="7025966722295861512">"Bluetooth volume"</item>
-    <item msgid="2265317984004577529">"Mute/unmute microphone"</item>
-    <item msgid="3646325683886507917">"Keep awake"</item>
+    <item msgid="4665183401128289653">"Keep awake"</item>
+    <item msgid="8584357129746649222">"Location"</item>
     <item msgid="7669257279311110599">"Location"</item>
-    <item msgid="7745724368696313169">"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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Default"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Small capitals"</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>
@@ -375,6 +385,11 @@
     <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>
@@ -512,4 +527,19 @@
     <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-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 802ab0c..cb83480 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <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_apps" msgid="6003687912727859577">"Show Apps"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Show Wi-Fi Strength"</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>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi Calling mode"</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>
+    <item msgid="3132912693346866895">"Wi-Fi only"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Off"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferred (Uses mobile network only if Wi-Fi isn\'t available)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile preferred (Uses Wi-Fi only if mobile network isn\'t available)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi only (Never uses mobile network. Can\'t make or receive calls if Wi-Fi isn\'t available)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Battery status"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Battery level"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"This will reset all settings related to networking to the factory defaults, 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="1745138973574945389">"Reset all network settings? You can\'t reverse this action!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reset settings"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"You need to draw your unlock pattern to confirm a network settings reset."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reset?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Network settings 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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"apps download applications system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps permissions security"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d apps provide conditions</item>
+      <item quantity="one">%d app provides 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Reset preferences across all apps to defaults"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps installed, including system and downloaded apps"</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>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index c500ce2..aa704fa 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Siempre"</item>
     <item msgid="844721238536786870">"Sólo cuando está conectado"</item>
-    <item msgid="2990218920631468642">"Nunca (aumenta el uso de los datos)"</item>
+    <item msgid="1986753720941888596">"Nunca"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Siempre"</item>
     <item msgid="7433294150916905997">"Sólo cuando está conectado"</item>
     <item msgid="1390404486722375028">"Nunca"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Últimos 30 días"</item>
+    <item msgid="6600989128423965319">"Configurar ciclo de uso…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automáticamente"</item>
+    <item msgid="1013988753804838790">"Automático"</item>
     <item msgid="6670588712989942178">"Sólo 5 GHz"</item>
     <item msgid="2715516524973207876">"Sólo 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Hora de uso"</item>
-    <item msgid="3703676222230317933">"Lanzar recuento"</item>
+    <item msgid="4796160515314745154">"Última utilización"</item>
     <item msgid="2502754479975776899">"Nombre de aplicación"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volumen de alarma"</item>
     <item msgid="785049718065337473">"volumen de notificación"</item>
     <item msgid="6700305533746877052">"volumen de bluetooth"</item>
-    <item msgid="3810969981743709839">"silenciar/dejar de silenciar micrófono"</item>
-    <item msgid="2627903914574908209">"mantener activo"</item>
-    <item msgid="1395372654968157578">"controlar ubicación"</item>
-    <item msgid="3238451051299611853">"controlar ubicación de alta potencia"</item>
+    <item msgid="2029227495214047094">"mantener en funcionamiento"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</item>
+    <item msgid="5753382310468855812">"supervisar ubicación de alta potencia"</item>
+    <item msgid="3356591542543137332">"obtener estadísticas de uso"</item>
+    <item msgid="3073734345226842233">"silenciar/dejar de silenciar micrófono"</item>
+    <item msgid="1148142988678569310">"proyectar contenido multimedia"</item>
+    <item msgid="9130014005474445273">"activar VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volumen de alarma"</item>
     <item msgid="9103719301075748925">"Volumen de notificación"</item>
     <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
-    <item msgid="2265317984004577529">"Silenciar/dejar de silenciar micrófono"</item>
-    <item msgid="3646325683886507917">"Mantener activo"</item>
+    <item msgid="4665183401128289653">"Mantener en funcionamiento"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
     <item msgid="7669257279311110599">"Ubicación"</item>
-    <item msgid="7745724368696313169">"Ubicación"</item>
+    <item msgid="3459320345690097795">"Obtener estadísticas de uso"</item>
+    <item msgid="1312534577834048535">"Silenciar/dejar de silenciar micrófono"</item>
+    <item msgid="5906017727368097853">"Proyectar contenido multimedia"</item>
+    <item msgid="2486614710846178542">"Activar VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predeterminado"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif condensada"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monoespacio"</item>
-    <item msgid="6857338041963571301">"Informal"</item>
-    <item msgid="961716102408512888">"Cursiva"</item>
-    <item msgid="784581717183349567">"Versalitas"</item>
+    <item msgid="7247838127505318669">"Sans-serif monoespaciada"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monoespaciada"</item>
+    <item msgid="639503332147461010">"Casual"</item>
+    <item msgid="7967169925231332424">"Cursiva"</item>
+    <item msgid="561832997193039673">"Versalitas"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Muy pequeño"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100 %"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Usar predeterminados de aplicación"</item>
+    <item msgid="7009918361545506251">"Predet."</item>
     <item msgid="1770533843436933500">"Blanco sobre negro"</item>
     <item msgid="758587126802411846">"Negro sobre blanco"</item>
     <item msgid="1495307195241623402">"Amarillo sobre negro"</item>
@@ -375,6 +385,11 @@
     <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/búfer registro"</item>
     <item msgid="2822309747675758628">"256 K/búfer registro"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
     <item msgid="6652164677254579050">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde azulado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Púrpura"</item>
+    <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 b8b063b..c904f37 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Config. avanzada"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicaciones"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar señal Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Recordar red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modo de llamada por Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Solo Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desactivado"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Red Wi-Fi preferida (utiliza la red móvil solo si no hay Wi-Fi disponible)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Red móvil preferida (utiliza Wi-Fi únicamente si la red móvil no está disponible)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Solo Wi-Fi (nunca usa la red móvil, no puedes hacer ni recibir llamadas si no hay conexión Wi-Fi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de la batería"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Esta acción restablecerá los parámetros relacionados con la red a la configuración de fábrica, lo que incluye: \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="1745138973574945389">"¿Quieres restablecer la configuración de red? No podrás revertir esta acción."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Debes dibujar el patrón de desbloqueo para confirmar el restablecimiento de la configuración de red."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Configuración de red restablecida"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,29 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplicaciones proporcionan condiciones.</item>
+      <item quantity="one">%d aplicación proporciona 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>
@@ -2514,4 +2531,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer preferencias a sus valores predeterminados en todas las aplicaciones"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Hay <xliff:g id="COUNT">%d</xliff:g> aplicaciones instaladas, incluidas las aplicaciones del sistema y las descargadas."</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>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index eb4e6c4..923906d 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Siempre"</item>
     <item msgid="844721238536786870">"Solo si se está cargando"</item>
-    <item msgid="2990218920631468642">"Nunca (aumenta el uso de datos)"</item>
+    <item msgid="1986753720941888596">"Nunca"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Siempre"</item>
     <item msgid="7433294150916905997">"Solo si se está cargando"</item>
     <item msgid="1390404486722375028">"Nunca"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Últimos 30 días"</item>
+    <item msgid="6600989128423965319">"Establecer ciclo uso..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automático"</item>
+    <item msgid="1013988753804838790">"Automático"</item>
     <item msgid="6670588712989942178">"Solo 5 GHz"</item>
     <item msgid="2715516524973207876">"Solo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Tiempo de uso"</item>
-    <item msgid="3703676222230317933">"Número de ejecuciones"</item>
+    <item msgid="4796160515314745154">"Último uso"</item>
     <item msgid="2502754479975776899">"Nombre de la aplicación"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -196,7 +199,7 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ninguno"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Ajustes automáticos proxy"</item>
+    <item msgid="168893341855953140">"Proxy autoconfigurado"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ninguno"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volumen de la alarma"</item>
     <item msgid="785049718065337473">"volumen de las notificaciones"</item>
     <item msgid="6700305533746877052">"volumen de Bluetooth"</item>
-    <item msgid="3810969981743709839">"silenciar/activar micrófono"</item>
-    <item msgid="2627903914574908209">"mantener activo"</item>
-    <item msgid="1395372654968157578">"controlar ubicación"</item>
-    <item msgid="3238451051299611853">"supervisar ubicación de alta potencia"</item>
+    <item msgid="2029227495214047094">"mantener activo"</item>
+    <item msgid="26109888160231211">"controlar ubicación"</item>
+    <item msgid="5753382310468855812">"supervisar ubicación de alta potencia"</item>
+    <item msgid="3356591542543137332">"obtener estadísticas de uso"</item>
+    <item msgid="3073734345226842233">"silenciar/activar micrófono"</item>
+    <item msgid="1148142988678569310">"proyectar contenido multimedia"</item>
+    <item msgid="9130014005474445273">"activar VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Ubicación"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volumen de alarma"</item>
     <item msgid="9103719301075748925">"Volumen de notificaciones"</item>
     <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
-    <item msgid="2265317984004577529">"Silenciar/activar micrófono"</item>
-    <item msgid="3646325683886507917">"Mantener activo"</item>
+    <item msgid="4665183401128289653">"Mantener activo"</item>
+    <item msgid="8584357129746649222">"Ubicación"</item>
     <item msgid="7669257279311110599">"Ubicación"</item>
-    <item msgid="7745724368696313169">"Ubicación"</item>
+    <item msgid="3459320345690097795">"Obtener estadísticas de uso"</item>
+    <item msgid="1312534577834048535">"Silenciar/activar micrófono"</item>
+    <item msgid="5906017727368097853">"Proyectar contenido multimedia"</item>
+    <item msgid="2486614710846178542">"Activar VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predeterminado"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursiva"</item>
-    <item msgid="784581717183349567">"Versalitas"</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">"Cursiva"</item>
+    <item msgid="561832997193039673">"Versalitas"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Muy pequeña"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Usar predeterminados aplicación"</item>
+    <item msgid="7009918361545506251">"Por defecto"</item>
     <item msgid="1770533843436933500">"Blanco sobre negro"</item>
     <item msgid="758587126802411846">"Negro sobre blanco"</item>
     <item msgid="1495307195241623402">"Amarillo sobre negro"</item>
@@ -375,6 +385,11 @@
     <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/búfer registro"</item>
     <item msgid="2822309747675758628">"256 K/búfer registro"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
     <item msgid="6652164677254579050">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquesa"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <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 3de8843..3d960db 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Buscar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ajustes avanzados"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicaciones"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar señal Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar con red"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Recordar red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modo de llamadas Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Solo conexión Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desactivadas"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferir conexión Wi-Fi (solo se usa la red móvil si la conexión Wi-Fi no está disponible)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferir conexión móvil (solo se usa la conexión Wi-Fi si la red móvil no está disponible)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Solo conexión Wi-Fi (no se usa la red móvil; no es posible hacer ni recibir llamadas sin Wi-Fi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel de batería"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Se restablecerán los valores de fábrica de todos los ajustes relacionados con las redes, 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="1745138973574945389">"¿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_gesture_explanation" msgid="8615374120762720549">"Debes dibujar el patrón de desbloqueo para confirmar que quieres que se restablezcan los ajustes de red."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"¿Restablecer?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Restablecimiento de 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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplicaciones proporcionan condiciones</item>
+      <item quantity="one">%d aplicación proporciona 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer los valores predeterminados de las preferencias de todas las aplicaciones"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicaciones instaladas, incluidas aplicaciones descargadas y del sistema"</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>
 </resources>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index 8a3eedc..0812db7 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Alati"</item>
     <item msgid="844721238536786870">"Ainult siis, kui on ühendatud"</item>
-    <item msgid="2990218920631468642">"Mitte kunagi (suurendab andmekasutust)"</item>
+    <item msgid="1986753720941888596">"Mitte kunagi"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Alati"</item>
     <item msgid="7433294150916905997">"Ainult siis, kui on ühendatud"</item>
     <item msgid="1390404486722375028">"Mitte kunagi"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Viimased 30 päeva"</item>
+    <item msgid="6600989128423965319">"Kas. tsükli määramine ..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automaatne"</item>
+    <item msgid="1013988753804838790">"Automaatne"</item>
     <item msgid="6670588712989942178">"Ainult 5 GHz"</item>
     <item msgid="2715516524973207876">"Ainult 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Kasutusaeg"</item>
-    <item msgid="3703676222230317933">"Käivita loendus"</item>
+    <item msgid="4796160515314745154">"Viimane kasutamine"</item>
     <item msgid="2502754479975776899">"Rakenduse nimi"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"äratuse helitugevus"</item>
     <item msgid="785049718065337473">"märguande helitugevus"</item>
     <item msgid="6700305533746877052">"Bluetoothi helitugevus"</item>
-    <item msgid="3810969981743709839">"mikrofoni vaigistamine või vaigistuse tühistamine"</item>
-    <item msgid="2627903914574908209">"ärkvel hoidmine"</item>
-    <item msgid="1395372654968157578">"asukoha jälgimine"</item>
-    <item msgid="3238451051299611853">"suure võimsusega asukoha jälgimine"</item>
+    <item msgid="2029227495214047094">"hoia ärkvel"</item>
+    <item msgid="26109888160231211">"monitori asukoht"</item>
+    <item msgid="5753382310468855812">"suure võimsusega asukoha jälgimine"</item>
+    <item msgid="3356591542543137332">"kasutusstatistika hankimine"</item>
+    <item msgid="3073734345226842233">"mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+    <item msgid="1148142988678569310">"meediumi projitseerimine"</item>
+    <item msgid="9130014005474445273">"VPN-i aktiveerimine"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Asukoht"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarmi helitugevus"</item>
     <item msgid="9103719301075748925">"Märguande helitugevus"</item>
     <item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
-    <item msgid="2265317984004577529">"Mikrofoni vaigistamine või vaigistuse tühistamine"</item>
-    <item msgid="3646325683886507917">"Ärkvel hoidmine"</item>
+    <item msgid="4665183401128289653">"Hoia ärkvel"</item>
+    <item msgid="8584357129746649222">"Asukoht"</item>
     <item msgid="7669257279311110599">"Asukoht"</item>
-    <item msgid="7745724368696313169">"Asukoht"</item>
+    <item msgid="3459320345690097795">"Kasutusstatistika hankimine"</item>
+    <item msgid="1312534577834048535">"Mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+    <item msgid="5906017727368097853">"Meediumi projitseerimine"</item>
+    <item msgid="2486614710846178542">"VPN-i aktiveerimine"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Vaikimisi"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif, tihendatud"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Püsisammkiri"</item>
-    <item msgid="6857338041963571301">"Lihtne"</item>
-    <item msgid="961716102408512888">"Kursiiv"</item>
-    <item msgid="784581717183349567">"Kapiteelkiri"</item>
+    <item msgid="7247838127505318669">"Seriifideta püsisammkiri"</item>
+    <item msgid="4478414822462359763">"Seriifidega"</item>
+    <item msgid="7502451783483660829">"Seriifidega püsisammkiri"</item>
+    <item msgid="639503332147461010">"Lihtne"</item>
+    <item msgid="7967169925231332424">"Kursiiv"</item>
+    <item msgid="561832997193039673">"Kapiteelkiri"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Väga väike"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Kasuta rakenduse vaikeseadeid"</item>
+    <item msgid="7009918361545506251">"Kasuta vaikeseadeid"</item>
     <item msgid="1770533843436933500">"Valge mustal"</item>
     <item msgid="758587126802411846">"Must valgel"</item>
     <item msgid="1495307195241623402">"Kollane mustal"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 000 000"</item>
     <item msgid="3025431211013424097">"16 000 000"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 000"</item>
+    <item msgid="3534782711045262344">"256 000"</item>
+    <item msgid="8085867209202153403">"1 000 000"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 k / logipuhver"</item>
     <item msgid="2822309747675758628">"256 k / logipuhver"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Vahemälus (tegevuse klient)"</item>
     <item msgid="6652164677254579050">"Vahemälus (tühi)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Sinakasroheline"</item>
+    <item msgid="8332294763632946560">"Sinine"</item>
+    <item msgid="2023216417616991392">"Indigosinine"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <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 c7bdecb..e276369 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Kuva rakendused"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Kuva WiFi tugevus"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Loo võrguühendus"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Jäta võrk meelde"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unusta võrk"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"WiFi-kõnerežiim"</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>
+    <item msgid="3132912693346866895">"Ainult WiFi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Väljas"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"WiFi eelistusega (kasutab mobiilivõrku vaid siis, kui WiFi pole saadaval)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobiilside eelistusega (kasutab WiFi-võrku vaid siis, kui mobiilivõrk pole saadaval)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Ainult WiFi (Mobiilivõrku ei kasutata. Kui WiFi-t pole, ei saa helistada ega kõnesid vastu võtta)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Aku olek"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aku tase"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"See lähtestab kõik võrguühendusega seotud seaded tehase vaikeseadetele, 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Võrguseadete lähtestamise kinnitamiseks peate joonistama avamismustri."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Kas lähtestada?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Võrguseadete lähtestamine"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"rakendused allalaadimine rakendus süsteem"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d rakendust esitavad tingimusi</item>
+      <item quantity="one">%d rakendus esitab tingimusi</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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Kõikide rakenduste eelistuste lähtestamine vaikeseadetele"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Installiti <xliff:g id="COUNT">%d</xliff:g> rakendust, sh süsteemi- ja allalaaditud rakendused"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/xml/quick_launch_settings.xml b/res/values-eu-rES-nokeys/strings.xml
similarity index 61%
copy from res/xml/quick_launch_settings.xml
copy to res/values-eu-rES-nokeys/strings.xml
index eb5585c..0bfe069 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/values-eu-rES-nokeys/strings.xml
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
+ -->
 
-<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>   
+<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">"Kudeatu aplikazioak"</string>
+</resources>
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu-rES/arrays.xml
index 4c8cdbd..59fbbc3 100644
--- a/res/values-eu-rES/arrays.xml
+++ b/res/values-eu-rES/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Beti"</item>
     <item msgid="844721238536786870">"Entxufatuta dagoenean soilik"</item>
-    <item msgid="2990218920631468642">"Inoiz ez (datu-erabilera areagotzen da)"</item>
+    <item msgid="1986753720941888596">"Inoiz ez"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Beti"</item>
     <item msgid="7433294150916905997">"Entxufatuta dagoenean soilik"</item>
     <item msgid="1390404486722375028">"Inoiz ez"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Azken 30 egunak"</item>
+    <item msgid="6600989128423965319">"Erabilera-zikloa…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatikoa"</item>
+    <item msgid="1013988753804838790">"Automatikoa"</item>
     <item msgid="6670588712989942178">"5 GHz soilik"</item>
     <item msgid="2715516524973207876">"2,4 GHz soilik"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Erabilera-denbora"</item>
-    <item msgid="3703676222230317933">"Abiarazte kopurua"</item>
+    <item msgid="4796160515314745154">"Erabilitako azken aldia"</item>
     <item msgid="2502754479975776899">"Aplikazioaren izena"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarmaren bolumena"</item>
     <item msgid="785049718065337473">"jakinarazpenen bolumena"</item>
     <item msgid="6700305533746877052">"Bluetootharen bolumena"</item>
-    <item msgid="3810969981743709839">"aktibatu edo desaktibatu mikrofonoa"</item>
-    <item msgid="2627903914574908209">"eduki aktibo"</item>
-    <item msgid="1395372654968157578">"kontrolatu kokapena"</item>
-    <item msgid="3238451051299611853">"egin potentzia handiko kokapen-kontrola"</item>
+    <item msgid="2029227495214047094">"eduki aktibo"</item>
+    <item msgid="26109888160231211">"kontrolatu kokapena"</item>
+    <item msgid="5753382310468855812">"egin potentzia handiko kokapen-kontrola"</item>
+    <item msgid="3356591542543137332">"lortu erabilera-estatistikak"</item>
+    <item msgid="3073734345226842233">"aktibatu edo desaktibatu mikrofonoa"</item>
+    <item msgid="1148142988678569310">"proiektatu multimedia-edukia"</item>
+    <item msgid="9130014005474445273">"aktibatu VPN konexioa"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Kokapena"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarmaren bolumena"</item>
     <item msgid="9103719301075748925">"Jakinarazpenen bolumena"</item>
     <item msgid="7025966722295861512">"Bluetootharen bolumena"</item>
-    <item msgid="2265317984004577529">"Aktibatu edo desaktibatu mikrofonoa"</item>
-    <item msgid="3646325683886507917">"Mantendu aktibo"</item>
+    <item msgid="4665183401128289653">"Mantendu aktibo"</item>
+    <item msgid="8584357129746649222">"Kokapena"</item>
     <item msgid="7669257279311110599">"Kokapena"</item>
-    <item msgid="7745724368696313169">"Kokapena"</item>
+    <item msgid="3459320345690097795">"Lortu erabilera-estatistikak"</item>
+    <item msgid="1312534577834048535">"Aktibatu edo desaktibatu mikrofonoa"</item>
+    <item msgid="5906017727368097853">"Proiektatu multimedia-edukia"</item>
+    <item msgid="2486614710846178542">"Aktibatu VPN konexioa"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Laburra"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Lehenetsia"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif kondentsatua"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Tarte bakarrekoa"</item>
-    <item msgid="6857338041963571301">"Arrunta"</item>
-    <item msgid="961716102408512888">"Etzana"</item>
-    <item msgid="784581717183349567">"Maiuskula txikiak"</item>
+    <item msgid="7247838127505318669">"Tarte bakarreko sans-serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Tarte bakarreko serif"</item>
+    <item msgid="639503332147461010">"Arrunta"</item>
+    <item msgid="7967169925231332424">"Etzana"</item>
+    <item msgid="561832997193039673">"Maiuskula txikiak"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Oso txikia"</item>
@@ -375,6 +385,11 @@
     <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 erregistroen bufferreko"</item>
     <item msgid="2822309747675758628">"256 K erregistroen bufferreko"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Cachean gordetakoa (jardueren bezeroa)"</item>
     <item msgid="6652164677254579050">"Cachean gordetakoa (hutsik)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Anila"</item>
+    <item msgid="8332294763632946560">"Urdina"</item>
+    <item msgid="2023216417616991392">"Indigoa"</item>
+    <item msgid="3170497246594232819">"Morea"</item>
+    <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 7b5a33d..4a95f03 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Bilatu"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ezarpen aurreratuak"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Erakutsi aplikazioak"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Erakutsi Wi-Fi seinalea"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Konektatu sarera"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Gogoratu sarea"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ahaztu sarea"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi bidez deitzeko modua"</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>
+    <item msgid="3132912693346866895">"Wi-Fi sarea soilik"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desaktibatuta"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi sarea hobetsia (Wi-Fi sarea erabilgarri ez badago soilik erabiltzen du sare mugikorra)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Sare mugikorra hobetsia (sare mugikorra erabilgarri ez badago soilik erabiltzen du Wi-Fi sarea)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi sarea soilik (Ez du sare mugikorra erabiltzen inoiz. Ezin da deirik egin edo jaso Wi-Fi sarera konektatuta egon ezean.)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Bateriaren egoera"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Bateria-maila"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Sarearekin erlazionatutako ezarpen guztiak fabrikako ezarpen lehenetsietara berrezarriko dira, hauek barne:\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="1745138973574945389">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ezin duzu ekintza hori desegin."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Berrezarri ezarpenak"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Sareko ezarpenak berrezarri nahi dituzula berresteko, desblokeatzeko eredua marraztu behar duzu."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Berrezarri?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Sareko ezarpenak berrezarri dira"</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_accounts" product="default" msgid="6412857499147999073">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <string name="keywords_accounts" msgid="1957925565953357627">"kontu"</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_all_apps" msgid="5377153522551809915">"aplikazioak deskargatu aplikazioa sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikazioak baimenak segurtasuna"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplikaziok baldintzak hornitzen dituzte</item>
+      <item quantity="one">%d aplikaziok baldintzak hornitzen ditu</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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Berrezarri aplikazio guztien hobespenak balio lehenetsietara"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplikazio instalatu dira, sistemakoak eta deskargatutakoak barne"</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>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 16820ab..3d7907d 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"همیشه"</item>
     <item msgid="844721238536786870">"تنها زمانی که وصل است"</item>
-    <item msgid="2990218920631468642">"هرگز (استفاده از داده افزایش می‌یابد)"</item>
+    <item msgid="1986753720941888596">"هرگز"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"همیشه"</item>
     <item msgid="7433294150916905997">"تنها زمانی که وصل است"</item>
     <item msgid="1390404486722375028">"هیچوقت"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"۳۰ روز گذشته"</item>
+    <item msgid="6600989128423965319">"تنظیم چرخه مصرف..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"خودکار"</item>
+    <item msgid="1013988753804838790">"خودکار"</item>
     <item msgid="6670588712989942178">"فقط 5 گیگاهرتز"</item>
     <item msgid="2715516524973207876">"فقط 2.4 گیگاهرتز"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"زمان استفاده"</item>
-    <item msgid="3703676222230317933">"تعداد راه‌اندازی‌ها"</item>
+    <item msgid="4796160515314745154">"آخرین زمان استفاده"</item>
     <item msgid="2502754479975776899">"نام برنامه"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"میزان صدای زنگ هشدار"</item>
     <item msgid="785049718065337473">"میزان صدای اعلان"</item>
     <item msgid="6700305533746877052">"میزان صدای بلوتوث"</item>
-    <item msgid="3810969981743709839">"صدادار/بی‌صداکردن میکروفون"</item>
-    <item msgid="2627903914574908209">"بیدارباش"</item>
-    <item msgid="1395372654968157578">"کنترل موقعیت مکانی"</item>
-    <item msgid="3238451051299611853">"کنترل مکان پرقدرت"</item>
+    <item msgid="2029227495214047094">"بیدار باش"</item>
+    <item msgid="26109888160231211">"کنترل موقعیت مکانی"</item>
+    <item msgid="5753382310468855812">"کنترل مکان پرقدرت"</item>
+    <item msgid="3356591542543137332">"دریافت آمار استفاده"</item>
+    <item msgid="3073734345226842233">"صدادار/بی‌صدا کردن میکروفن"</item>
+    <item msgid="1148142988678569310">"فرستادن رسانه"</item>
+    <item msgid="9130014005474445273">"‏فعال‌سازی VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"موقعیت مکانی"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"میزان صدای زنگ هشدار"</item>
     <item msgid="9103719301075748925">"میزان صدای اعلان"</item>
     <item msgid="7025966722295861512">"میزان صدای بلوتوث"</item>
-    <item msgid="2265317984004577529">"صدادار/بی‌صداکردن میکروفون"</item>
-    <item msgid="3646325683886507917">"بیدار باش"</item>
+    <item msgid="4665183401128289653">"بیدار باش"</item>
+    <item msgid="8584357129746649222">"موقعیت مکانی"</item>
     <item msgid="7669257279311110599">"مکان"</item>
-    <item msgid="7745724368696313169">"مکان"</item>
+    <item msgid="3459320345690097795">"دریافت آمار استفاده"</item>
+    <item msgid="1312534577834048535">"صدادار/بی‌صدا کردن میکروفن"</item>
+    <item msgid="5906017727368097853">"فرستادن رسانه"</item>
+    <item msgid="2486614710846178542">"‏فعال‌سازی VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"پیش‌فرض"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"‏Sans-serif فشرده"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"هم‌عرض"</item>
-    <item msgid="6857338041963571301">"معمولی"</item>
-    <item msgid="961716102408512888">"شکسته"</item>
-    <item msgid="784581717183349567">"حروف بزرگ با اندازه کوچک"</item>
+    <item msgid="7247838127505318669">"‏Sans-serif با عرض ثابت"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"‏Serif با عرض ثابت"</item>
+    <item msgid="639503332147461010">"غیررسمی"</item>
+    <item msgid="7967169925231332424">"شکسته"</item>
+    <item msgid="561832997193039673">"حروف بزرگ با اندازه کوچک"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"بسیار کوچک"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"۴ مگابایت"</item>
     <item msgid="3025431211013424097">"۱۶ مگابایت"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"۶۴ کیلوبایت"</item>
+    <item msgid="3534782711045262344">"۲۵۶ کیلوبایت"</item>
+    <item msgid="8085867209202153403">"۱ مگابایت"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"‏۶۴K در حافظه موقت ثبت"</item>
     <item msgid="2822309747675758628">"‏۲۵۶Kدر حافظه موقت ثبت"</item>
@@ -393,31 +408,31 @@
     <item msgid="45075631231212732">"‏همیشه از بررسی HDCP استفاده شود"</item>
   </string-array>
   <string-array name="window_animation_scale_entries">
-    <item msgid="8134156599370824081">"انیمیشن خاموش"</item>
-    <item msgid="6624864048416710414">"‏مقیاس انیمیشن 0.5x"</item>
-    <item msgid="2219332261255416635">"‏مقیاس انیمیشن 1x"</item>
-    <item msgid="3544428804137048509">"‏مقیاس انیمیشن 1.5x"</item>
-    <item msgid="3110710404225974514">"‏مقیاس انیمیشن 2x"</item>
-    <item msgid="4402738611528318731">"‏مقیاس انیمیشن 5x"</item>
-    <item msgid="6189539267968330656">"‏مقیاس انیمیشن 10X"</item>
+    <item msgid="8134156599370824081">"پویانمایی خاموش"</item>
+    <item msgid="6624864048416710414">"‏مقیاس پویانمایی 0.5x"</item>
+    <item msgid="2219332261255416635">"‏مقیاس پویانمایی 1x"</item>
+    <item msgid="3544428804137048509">"‏مقیاس پویانمایی 1.5x"</item>
+    <item msgid="3110710404225974514">"‏مقیاس پویانمایی 2x"</item>
+    <item msgid="4402738611528318731">"‏مقیاس پویانمایی 5x"</item>
+    <item msgid="6189539267968330656">"‏مقیاس پویانمایی 10X"</item>
   </string-array>
   <string-array name="transition_animation_scale_entries">
-    <item msgid="8464255836173039442">"انیمیشن خاموش"</item>
-    <item msgid="3375781541913316411">"‏مقیاس انیمیشن 0.5x"</item>
-    <item msgid="1991041427801869945">"‏مقیاس انیمیشن 1x"</item>
-    <item msgid="4012689927622382874">"‏مقیاس انیمیشن 1.5x"</item>
-    <item msgid="3289156759925947169">"‏مقیاس انیمیشن 2x"</item>
-    <item msgid="7705857441213621835">"‏مقیاس انیمیشن 5x"</item>
-    <item msgid="6660750935954853365">"‏مقیاس انیمیشن 10X"</item>
+    <item msgid="8464255836173039442">"پویانمایی خاموش"</item>
+    <item msgid="3375781541913316411">"‏مقیاس پویانمایی 0.5x"</item>
+    <item msgid="1991041427801869945">"‏مقیاس پویانمایی 1x"</item>
+    <item msgid="4012689927622382874">"‏مقیاس پویانمایی 1.5x"</item>
+    <item msgid="3289156759925947169">"‏مقیاس پویانمایی 2x"</item>
+    <item msgid="7705857441213621835">"‏مقیاس پویانمایی 5x"</item>
+    <item msgid="6660750935954853365">"‏مقیاس پویانمایی 10X"</item>
   </string-array>
   <string-array name="animator_duration_scale_entries">
-    <item msgid="6039901060648228241">"انیمیشن خاموش"</item>
-    <item msgid="1138649021950863198">"مقیاس انیمیشن 0.5 برابر"</item>
-    <item msgid="4394388961370833040">"مقیاس انیمیشن 1 برابر"</item>
-    <item msgid="8125427921655194973">"مقیاس انیمیشن 1.5 برابر"</item>
-    <item msgid="3334024790739189573">"مقیاس انیمیشن 2 برابر"</item>
-    <item msgid="3170120558236848008">"مقیاس انیمیشن 5 برابر"</item>
-    <item msgid="1069584980746680398">"مقیاس انیمیشن 10 برابر"</item>
+    <item msgid="6039901060648228241">"پویانمایی خاموش"</item>
+    <item msgid="1138649021950863198">"مقیاس پویانمایی 0.5 برابر"</item>
+    <item msgid="4394388961370833040">"مقیاس پویانمایی 1 برابر"</item>
+    <item msgid="8125427921655194973">"مقیاس پویانمایی 1.5 برابر"</item>
+    <item msgid="3334024790739189573">"مقیاس پویانمایی 2 برابر"</item>
+    <item msgid="3170120558236848008">"مقیاس پویانمایی 5 برابر"</item>
+    <item msgid="1069584980746680398">"مقیاس پویانمایی 10 برابر"</item>
   </string-array>
   <string-array name="overlay_display_devices_entries">
     <item msgid="1606809880904982133">"هیچکدام"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
     <item msgid="6652164677254579050">"قرار داده شده در حافظه پنهان (خالی)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"فیروزه‌ای"</item>
+    <item msgid="8332294763632946560">"آبی"</item>
+    <item msgid="2023216417616991392">"نیلی"</item>
+    <item msgid="3170497246594232819">"بنفش"</item>
+    <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 27f0821..b5f5ad2 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>
@@ -137,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>
@@ -156,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>
@@ -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">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</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>
@@ -393,8 +405,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">"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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"بلوتوث پیشرفته"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"وقتی بلوتوث روشن است، دستگاه شما می‌تواند با سایر دستگاه‌های بلوتوث اطراف ارتباط برقرار کند."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکن"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"پیشرفته"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"نمایش برنامه‌ها"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏نمایش قدرت WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"به خاطر سپردن شبکه"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"فراموش کردن شبکه"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"‏حالت تماس از طریق Wi-Fi"</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>
+    <item msgid="3132912693346866895">"‏فقط Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"۲"</item>
+    <item msgid="1171822231056612021">"۱"</item>
+    <item msgid="3194458950573886239">"۰"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"خاموش"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏Wi-Fi ترجیحی (تنها در صورت در دسترس نبودن Wi-Fi، از شبکه همراه استفاده می‌کند)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏شبکه همراه ترجیحی (تنها در صورت در دسترس نبودن شبکه همراه، از Wi-Fi استفاده می‌کند)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏فقط 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"وضعیت باتری"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مقدار شارژ باتری"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"‏این کار همه تنظیمات مرتبط با شبکه را به پیش‌فرض کارخانه بازنشانی می‌کند، از جمله:\n\n"<li>"Wifi"</li>\n<li>"داده همراه"</li>\n<li>"بلوتوث"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"بازنشانی تنظیمات"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"همه تنظیمات شبکه بازنشانی شود؟ این اقدام قابل بازگشت نیست!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"بازنشانی تنظیمات"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"برای تأیید بازنشانی تنظیمات شبکه، باید الگوی بازگشایی را بکشید."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"بازنشانی شود؟"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"بازنشانی تنظیمات شبکه"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"برنامه‌ها دانلود برنامه‌ها سیستم"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"امنیت مجوزهای برنامه‌ها"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">‏%d برنامه ارائه‌دهنده شرایط است</item>
+      <item quantity="other">‏%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"تنظیمات ترجیحی در همه برنامه‌ها به پیش‌فرض، بازنشانی می‌شود"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> برنامه نصب شده است، از جمله برنامه‌های سیستم و دانلود شده"</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>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index ff84bc2..a513316 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Aina"</item>
     <item msgid="844721238536786870">"Vain, kun laturi on kytketty"</item>
-    <item msgid="2990218920631468642">"Ei koskaan (lisää mobiilitiedonsiirtoa)"</item>
+    <item msgid="1986753720941888596">"Ei koskaan"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Aina"</item>
     <item msgid="7433294150916905997">"Vain, kun laturi on kytketty"</item>
     <item msgid="1390404486722375028">"Ei koskaan"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 viime päivää"</item>
+    <item msgid="6600989128423965319">"Aseta käyttöjakso…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automaattinen"</item>
+    <item msgid="1013988753804838790">"Automaattinen"</item>
     <item msgid="6670588712989942178">"Vain 5 GHz"</item>
     <item msgid="2715516524973207876">"Vain 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Käyttöaika"</item>
-    <item msgid="3703676222230317933">"Käynnistyskertojen lukumäärä"</item>
+    <item msgid="4796160515314745154">"Viimeinen käyttöaika"</item>
     <item msgid="2502754479975776899">"Sovelluksen nimi"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -243,7 +246,7 @@
     <item msgid="6546959730920410907">"muokkaa puhelulokia"</item>
     <item msgid="446877710771379667">"lue kalenteria"</item>
     <item msgid="7674458294386319722">"muokkaa kalenteria"</item>
-    <item msgid="8281201165558093009">"wifi-haku"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-haku"</item>
     <item msgid="8694611243479480497">"ilmoitus"</item>
     <item msgid="7776439107987345446">"soluhaku"</item>
     <item msgid="514615766544675057">"soita numeroon"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"hälytyksen äänenvoimakkuus"</item>
     <item msgid="785049718065337473">"ilmoituksen äänenvoimakkuus"</item>
     <item msgid="6700305533746877052">"bluetooth-äänenvoimakkuus"</item>
-    <item msgid="3810969981743709839">"mykistä mikrofoni / poista mykistys"</item>
-    <item msgid="2627903914574908209">"ei virransäästötilaa"</item>
-    <item msgid="1395372654968157578">"sijainnin seuranta"</item>
-    <item msgid="3238451051299611853">"suuritehoinen sijainnin seuranta"</item>
+    <item msgid="2029227495214047094">"ei virransäästötilaa"</item>
+    <item msgid="26109888160231211">"sijainnin seuranta"</item>
+    <item msgid="5753382310468855812">"seuraa suuritehoista sijaintia"</item>
+    <item msgid="3356591542543137332">"hae käyttötilastot"</item>
+    <item msgid="3073734345226842233">"mykistä mikrofoni / poista mykistys"</item>
+    <item msgid="1148142988678569310">"lähetä media"</item>
+    <item msgid="9130014005474445273">"aktivoi VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sijainti"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Hälytyksen voimakkuus"</item>
     <item msgid="9103719301075748925">"Ilmoituksen äänenvoimakkuus"</item>
     <item msgid="7025966722295861512">"Bluetooth-äänenvoimakkuus"</item>
-    <item msgid="2265317984004577529">"Mykistä mikrofoni / poista mykistys"</item>
-    <item msgid="3646325683886507917">"Ei virransäästötilaa"</item>
+    <item msgid="4665183401128289653">"Ei virransäästötilaa"</item>
+    <item msgid="8584357129746649222">"Sijainti"</item>
     <item msgid="7669257279311110599">"Sijainti"</item>
-    <item msgid="7745724368696313169">"Sijainti"</item>
+    <item msgid="3459320345690097795">"Hae käyttötilastot"</item>
+    <item msgid="1312534577834048535">"Mykistä mikrofoni / poista mykistys"</item>
+    <item msgid="5906017727368097853">"Lähetä media"</item>
+    <item msgid="2486614710846178542">"Aktivoi VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhyt"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Oletus"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif, tiivistetty"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Tavallinen"</item>
-    <item msgid="961716102408512888">"Kursiivi"</item>
-    <item msgid="784581717183349567">"Isot kirjaimet"</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">"Kursiivi"</item>
+    <item msgid="561832997193039673">"Isot kirjaimet"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Hyvin pieni"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 Mt"</item>
     <item msgid="3025431211013424097">"16 Mt"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 kt"</item>
+    <item msgid="3534782711045262344">"256 kt"</item>
+    <item msgid="8085867209202153403">"1 Mt"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 kt / lokipuskuri"</item>
     <item msgid="2822309747675758628">"256 kt / lokipusk."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Välimuistissa (toiminnan suorittaja)"</item>
     <item msgid="6652164677254579050">"Välimuistissa (tyhjä)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turkoosi"</item>
+    <item msgid="8332294763632946560">"Sininen"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violetti"</item>
+    <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 e5688d6..da2c375 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,30 @@
     <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 tabletti"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa puhelin"</string>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora Wi-Fi-yhteys"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Etsi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lisäasetukset"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Näytä sovellukset"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Näytä Wi-Fi-signaali"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Yhdistä verkkoon"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Muista verkko"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unohda verkko"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-puhelutila"</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>
+    <item msgid="3132912693346866895">"Vain Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Ei käytössä"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi ensisijainen (käyttää matkapuhelinverkkoa vain jos Wi-Fi-verkko ei ole käytettävissä)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Matkapuhelinverkko ensisijainen (käyttää Wi-Fi-verkkoa vain jos matkapuhelinverkko ei ole käytettävissä)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Vain Wi-Fi (Ei koskaan käytä matkapuhelinverkkoa. Ei voi soittaa tai vastaanottaa puheluita, jos Wi-Fi ei ole käytettävissä.)"</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>
@@ -816,6 +806,11 @@
     <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">"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">"Laitteen oltua käyttämättä: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Akun tila"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akun taso"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Tämä palauttaa kaikkien verkkoon liittyvien asetusten tehdasasetukset, 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="1745138973574945389">"Nollataanko kaikki verkkoasetukset? Tätä toimintoa ei voi peruuttaa."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nollaa asetukset"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Vahvista verkkoasetusten nollaus piirtämällä lukituksenpoistokuviosi."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nollataanko?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Verkkoasetusten nollaus"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,8 @@
     <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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"sovellukset lataus järjestelmä"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d sovellusta toimii ehtojen toimituspalveluna.</item>
+      <item quantity="one">%d sovellus toimii ehtojen toimituspalveluna.</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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Palauta kaikkien sovellusten asetusten oletusarvot"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> sovellusta asennettu, mukaan lukien järjestelmäsovelluksia ja ladattuja sovelluksia."</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index c7016df..428b7ea 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -147,28 +146,32 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Faible"</item>
-    <item msgid="5615082285463430971">"Correct"</item>
+    <item msgid="5615082285463430971">"Satisfaisante"</item>
     <item msgid="3565079809875324621">"Bon"</item>
     <item msgid="5702329417707689835">"Excellent"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Toujours"</item>
     <item msgid="844721238536786870">"Uniquement si l\'appareil ebranché"</item>
-    <item msgid="2990218920631468642">"Jamais (utilise plus de données)"</item>
+    <item msgid="1986753720941888596">"Jamais"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Toujours"</item>
     <item msgid="7433294150916905997">"Uniquement si l\'appareil ebranché"</item>
     <item msgid="1390404486722375028">"Jamais"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 derniers jours"</item>
+    <item msgid="6600989128423965319">"Défin. du cycle d\'util..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Auto"</item>
+    <item msgid="1013988753804838790">"Automatique"</item>
     <item msgid="6670588712989942178">"5 GHz uniquement"</item>
     <item msgid="2715516524973207876">"2,4 GHz uniquement"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Temps d\'utilisation"</item>
-    <item msgid="3703676222230317933">"Nombre de lancements"</item>
+    <item msgid="4796160515314745154">"Dernière utilisation :"</item>
     <item msgid="2502754479975776899">"Nom de l\'application"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -260,7 +263,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>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume des alarmes"</item>
     <item msgid="785049718065337473">"volume des notifications"</item>
     <item msgid="6700305533746877052">"volume Bluetooth"</item>
-    <item msgid="3810969981743709839">"activer/désactiver le micro"</item>
-    <item msgid="2627903914574908209">"maintenir activé"</item>
-    <item msgid="1395372654968157578">"surveiller la position"</item>
-    <item msgid="3238451051299611853">"surveiller les requêtes de localisation qui nécessitent une quantité d\'énergie importante"</item>
+    <item msgid="2029227495214047094">"maintenir activé"</item>
+    <item msgid="26109888160231211">"suivre la position"</item>
+    <item msgid="5753382310468855812">"surveiller les lieux de grande puissance"</item>
+    <item msgid="3356591542543137332">"obtenir les statistiques d\'utilisation"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Position"</item>
@@ -306,7 +312,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>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume de l\'alarme"</item>
     <item msgid="9103719301075748925">"Volume des notifications"</item>
     <item msgid="7025966722295861512">"Volume Bluetooth"</item>
-    <item msgid="2265317984004577529">"Activer/Désactiver le micro"</item>
-    <item msgid="3646325683886507917">"Maintenir activé"</item>
+    <item msgid="4665183401128289653">"Maintenir activé"</item>
+    <item msgid="8584357129746649222">"Lieu"</item>
     <item msgid="7669257279311110599">"Position"</item>
-    <item msgid="7745724368696313169">"Lieu"</item>
+    <item msgid="3459320345690097795">"Obtenir les statistiques d\'utilisation"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court-métrage"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Par défaut"</item>
     <item msgid="1016452621833735880">"Sans empattement"</item>
     <item msgid="2496277987934654454">"Sans empattement condensée"</item>
-    <item msgid="4406003087391086325">"Avec empattement"</item>
-    <item msgid="1558362802170124073">"Espace simple"</item>
-    <item msgid="6857338041963571301">"Script"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Petites majuscules"</item>
+    <item msgid="7247838127505318669">"Espace unique, sans empattement"</item>
+    <item msgid="4478414822462359763">"Avec empattement"</item>
+    <item msgid="7502451783483660829">"Espace unique, avec empattement"</item>
+    <item msgid="639503332147461010">"Scripte"</item>
+    <item msgid="7967169925231332424">"Cursive"</item>
+    <item msgid="561832997193039673">"Petites majuscules"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Très petite"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 Mo"</item>
     <item msgid="3025431211013424097">"16 Mo"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 ko"</item>
+    <item msgid="3534782711045262344">"256 ko"</item>
+    <item msgid="8085867209202153403">"1 Mo"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"1 ko/tampon journal"</item>
     <item msgid="2822309747675758628">"256 Ko/tampon journal"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
     <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquoise"</item>
+    <item msgid="8332294763632946560">"Bleu"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Mauve"</item>
+    <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 0f0bfa8..cd19381 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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">"Diffuser 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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanner"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Affich. applications"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Aff. intensité Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Mémoriser ce réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Mode d\'appel Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi-Fi seulement"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Désactivé"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Utiliser le réseau Wi-Fi de préférence (cellulaire seulement si réseau Wi-Fi non disponible)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Utiliser le réseau cellulaire de préférence (Wi-Fi seulement si réseau cellulaire non disponible)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi seulement (jamais util. rés. cell. : impossible de faire des appels si Wi-Fi non disponible)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Cette action permet de réinitialiser tous les paramètres réseau à leurs valeurs par défaut : \n\n"<li>"Connexions 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation des paramètres réseau."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Réinitialiser les paramètres réseau"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d application fournit des conditions</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Réinitialiser les préférences par défaut dans toutes les applications"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> applications installées, y compris les applications système et les applications téléchargées"</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>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index f0c7f9b..395bd6d 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Toujours"</item>
     <item msgid="844721238536786870">"Uniquement si l\'appareil est branché"</item>
-    <item msgid="2990218920631468642">"Jamais (utilise plus de données)"</item>
+    <item msgid="1986753720941888596">"Jamais"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Toujours"</item>
     <item msgid="7433294150916905997">"Uniquement si appareil branché"</item>
     <item msgid="1390404486722375028">"Jamais"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 derniers jours"</item>
+    <item msgid="6600989128423965319">"Définir cycle conso..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatique"</item>
+    <item msgid="1013988753804838790">"Automatique"</item>
     <item msgid="6670588712989942178">"5 GHz uniquement"</item>
     <item msgid="2715516524973207876">"2,4 GHz uniquement"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Temps d\'utilisation"</item>
-    <item msgid="3703676222230317933">"Nombre de lancements"</item>
+    <item msgid="4796160515314745154">"Dernière utilisation"</item>
     <item msgid="2502754479975776899">"Nom de l\'application"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume des alarmes"</item>
     <item msgid="785049718065337473">"volume des notifications"</item>
     <item msgid="6700305533746877052">"volume Bluetooth"</item>
-    <item msgid="3810969981743709839">"activer/désactiver le micro"</item>
-    <item msgid="2627903914574908209">"maintenir activé"</item>
-    <item msgid="1395372654968157578">"surveiller la position"</item>
-    <item msgid="3238451051299611853">"surveiller les requêtes de localisation qui utilisent la batterie de manière intensive"</item>
+    <item msgid="2029227495214047094">"maintenir activé"</item>
+    <item msgid="26109888160231211">"suivre la position"</item>
+    <item msgid="5753382310468855812">"surveiller les requêtes de localisation qui nécessitent une quantité d\'énergie importante"</item>
+    <item msgid="3356591542543137332">"obtenir des statistiques d\'utilisation"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Position"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume de l\'alarme"</item>
     <item msgid="9103719301075748925">"Volume des notifications"</item>
     <item msgid="7025966722295861512">"Volume Bluetooth"</item>
-    <item msgid="2265317984004577529">"Activer/Désactiver le micro"</item>
-    <item msgid="3646325683886507917">"Maintenir activé"</item>
+    <item msgid="4665183401128289653">"Maintenir activé"</item>
+    <item msgid="8584357129746649222">"Localisation"</item>
     <item msgid="7669257279311110599">"Localisation"</item>
-    <item msgid="7745724368696313169">"Position"</item>
+    <item msgid="3459320345690097795">"Obtenir des statistiques d\'utilisation"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Par défaut"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif condensé"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Espace simple"</item>
-    <item msgid="6857338041963571301">"Scripte"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Petites majuscules"</item>
+    <item msgid="7247838127505318669">"Sans Serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Scripte"</item>
+    <item msgid="7967169925231332424">"Cursive"</item>
+    <item msgid="561832997193039673">"Petites majuscules"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Très petite"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 Mo"</item>
     <item msgid="3025431211013424097">"16 Mo"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 Ko"</item>
+    <item msgid="3534782711045262344">"256 Ko"</item>
+    <item msgid="8085867209202153403">"1 Mo"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 Ko/tampon journal"</item>
     <item msgid="2822309747675758628">"256 Ko/tampon journal"</item>
@@ -487,8 +502,8 @@
   </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>
+    <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>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
     <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turquoise"</item>
+    <item msgid="8332294763632946560">"Bleu"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violet"</item>
+    <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 6363145..244d3d7 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Se connecter à…"</string>
-    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Multimédia"</string>
-    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Appels et notifications"</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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Rechercher"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Options avancées"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Afficher les applis"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Aff. force Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Se souvenir du réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Mode d\'appel Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi-Fi uniquement"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Désactivé"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi préféré (N\'utilise le réseau mobile que si le Wi-Fi n\'est pas disponible.)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobile préféré (N\'utilise le Wi-Fi que si le réseau mobile n\'est pas disponible.)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi uniquement (Réseau mobile jamais utilisé. Impossible passer/recevoir appels si Wi-Fi non dispo.)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Niveau de la batterie"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"La configuration d\'usine sera rétablie pour tous les paramètres associés aux réseaux, y compris pour 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Vous devez dessiner votre schéma de déverrouillage pour confirmer la réinitialisation des paramètres des réseaux."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Réinitialiser ?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d application fournit des conditions.</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Rétablir les valeurs par défaut pour les préférences dans toutes les applications"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> applications installées, y compris des applications système et des applications téléchargées"</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>
 </resources>
diff --git a/res/xml/quick_launch_settings.xml b/res/values-gl-rES-nokeys/strings.xml
similarity index 61%
copy from res/xml/quick_launch_settings.xml
copy to res/values-gl-rES-nokeys/strings.xml
index eb5585c..6ff272f 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/values-gl-rES-nokeys/strings.xml
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
+ -->
 
-<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>   
+<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">"Xestionar aplicacións"</string>
+</resources>
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl-rES/arrays.xml
index b85a10e..dc25604 100644
--- a/res/values-gl-rES/arrays.xml
+++ b/res/values-gl-rES/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
     <item msgid="844721238536786870">"Só cando está conectada"</item>
-    <item msgid="2990218920631468642">"Nunca (aumenta o consumo de datos)"</item>
+    <item msgid="1986753720941888596">"Nunca"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
     <item msgid="7433294150916905997">"Só cando está conectada"</item>
     <item msgid="1390404486722375028">"Nunca"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Últimos 30 días"</item>
+    <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automática"</item>
+    <item msgid="1013988753804838790">"Automática"</item>
     <item msgid="6670588712989942178">"Só 5 GHz"</item>
     <item msgid="2715516524973207876">"Só 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Tempo de uso"</item>
-    <item msgid="3703676222230317933">"Reconto de inicios"</item>
+    <item msgid="4796160515314745154">"Última vez que se utilizou"</item>
     <item msgid="2502754479975776899">"Nome da aplicación"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume da alarma"</item>
     <item msgid="785049718065337473">"volume das notificacións"</item>
     <item msgid="6700305533746877052">"volume do Bluetooth"</item>
-    <item msgid="3810969981743709839">"desactivar/activar o micrófono"</item>
-    <item msgid="2627903914574908209">"manter activo"</item>
-    <item msgid="1395372654968157578">"supervisar a localización"</item>
-    <item msgid="3238451051299611853">"supervisar localización de alta potencia"</item>
+    <item msgid="2029227495214047094">"manter activo"</item>
+    <item msgid="26109888160231211">"supervisar a localización"</item>
+    <item msgid="5753382310468855812">"supervisar localización de alta potencia"</item>
+    <item msgid="3356591542543137332">"obter estatísticas de uso"</item>
+    <item msgid="3073734345226842233">"desactivar/activar o micrófono"</item>
+    <item msgid="1148142988678569310">"multimedia do proxecto"</item>
+    <item msgid="9130014005474445273">"activar VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Localización"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume da alarma"</item>
     <item msgid="9103719301075748925">"Volume das notificacións"</item>
     <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
-    <item msgid="2265317984004577529">"Desactivar/activar o micrófono"</item>
-    <item msgid="3646325683886507917">"Manter activo"</item>
+    <item msgid="4665183401128289653">"Manter activo"</item>
+    <item msgid="8584357129746649222">"Localización"</item>
     <item msgid="7669257279311110599">"Localización"</item>
-    <item msgid="7745724368696313169">"Localización"</item>
+    <item msgid="3459320345690097795">"Obter estatísticas de uso"</item>
+    <item msgid="1312534577834048535">"Desactivar/activar o micrófono"</item>
+    <item msgid="5906017727368097853">"Multimedia do proxecto"</item>
+    <item msgid="2486614710846178542">"Activar VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predeterminado"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif condensada"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monoespazado"</item>
-    <item msgid="6857338041963571301">"Informal"</item>
-    <item msgid="961716102408512888">"Cursiva"</item>
-    <item msgid="784581717183349567">"Maiúsculas pequenas"</item>
+    <item msgid="7247838127505318669">"Monoespazado sans-serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Monoespazado serif"</item>
+    <item msgid="639503332147461010">"Informal"</item>
+    <item msgid="7967169925231332424">"Cursiva"</item>
+    <item msgid="561832997193039673">"Maiúsculas pequenas"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Moi pequeno"</item>
@@ -375,6 +385,11 @@
     <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">"Búfer 64 K rexistro"</item>
     <item msgid="2822309747675758628">"Búfer 256 K rexist."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Na caché (cliente de actividade)"</item>
     <item msgid="6652164677254579050">"Na caché (en branco)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde azulado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <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 55c28bd..64d1015 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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">"Identificació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> identificacións dixitais inscritas</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> identificació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 identificació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 identificació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 identificació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 identificació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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Explorar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzada"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicacións"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Intensidade wifi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar coa rede"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Lembrar rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modo de chamadas wifi"</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>
+    <item msgid="3132912693346866895">"Só wifi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desactivado"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wifi preferida (usa a rede de móbil só se a wifi non está dispoñible)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Móbil preferido (usa a wifi só se a rede móbil non está dispoñible)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Só wifi (non usa rede móbil. Non se poden realizar/recibir chamadas se non hai unha wifi dispoñible)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Estado da batería"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivel da batería"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Esta acción restablecerá toda a configuración relacionada coas redes aos valores predeterminados de fábrica, 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Tes que debuxar o teu padrón de desbloqueo para confirmar un restablecemento da configuración da rede."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Restablecer?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Restablecemento da 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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplicacións fornecen condicións</item>
+      <item quantity="one">%d aplicación fornece 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Restablecer valores predeterminados das preferencias en todas as aplicacións"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicacións instaladas, incluídas as aplicacións descargadas e as do sistema"</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>
 </resources>
diff --git a/res/xml/quick_launch_settings.xml b/res/values-h330dp/dimens.xml
similarity index 66%
copy from res/xml/quick_launch_settings.xml
copy to res/values-h330dp/dimens.xml
index eb5585c..eae9660 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/values-h330dp/dimens.xml
@@ -1,5 +1,5 @@
 <?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.
@@ -14,10 +14,7 @@
      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>   
+<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 51347e5..1f6c065 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -129,8 +128,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"पुश बटन"</item>
-    <item msgid="1624323946324499595">"साथी उपकरण से पिन"</item>
-    <item msgid="5366790421523328066">"इस उपकरण से पिन"</item>
+    <item msgid="1624323946324499595">"साथी डिवाइस से पिन"</item>
+    <item msgid="5366790421523328066">"इस डिवाइस से पिन"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"कनेक्ट है"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"हमेशा"</item>
     <item msgid="844721238536786870">"केवल प्‍लग इन करने पर"</item>
-    <item msgid="2990218920631468642">"कभी नहीं (डेटा का उपयोग बढ़ाता है)"</item>
+    <item msgid="1986753720941888596">"कभी नहीं"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"हमेशा"</item>
     <item msgid="7433294150916905997">"केवल प्‍लग इन करने पर"</item>
     <item msgid="1390404486722375028">"कभी नहीं"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"पिछले 30 दिन"</item>
+    <item msgid="6600989128423965319">"उपयोग चक्र सेट करें..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"स्‍वत:"</item>
+    <item msgid="1013988753804838790">"स्वचालित"</item>
     <item msgid="6670588712989942178">"केवल 5 GHz"</item>
     <item msgid="2715516524973207876">"केवल 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"उपयोग समय"</item>
-    <item msgid="3703676222230317933">"लॉन्च की संख्या"</item>
+    <item msgid="4796160515314745154">"पिछली बार उपयोग किया गया"</item>
     <item msgid="2502754479975776899">"ऐप्स का नाम"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -221,7 +224,7 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"आंतरिक उपकरण संग्रहण"</item>
+    <item msgid="8151497958991952759">"आंतरिक डिवाइस मेमोरी"</item>
     <item msgid="3738430123799803530">"निकाले जाने योग्‍य SD कार्ड"</item>
     <item msgid="4498124044785815005">"सिस्‍टम को निर्धारित करने दें"</item>
   </string-array>
@@ -230,7 +233,7 @@
     <item msgid="255608127647030286">"व्यक्तिगत"</item>
     <item msgid="4588829735729884491">"संदेश सेवा"</item>
     <item msgid="886742181977884584">"मीडिया"</item>
-    <item msgid="7924928667052300589">"उपकरण"</item>
+    <item msgid="7924928667052300589">"डिवाइस"</item>
   </string-array>
   <string-array name="app_ops_summaries">
     <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
@@ -243,8 +246,8 @@
     <item msgid="6546959730920410907">"कॉल लॉग बदलें"</item>
     <item msgid="446877710771379667">"कैलेंडर पढ़ें"</item>
     <item msgid="7674458294386319722">"कैलेंडर बदलें"</item>
-    <item msgid="8281201165558093009">"wi-fi स्कैन"</item>
-    <item msgid="8694611243479480497">"सूचना"</item>
+    <item msgid="8281201165558093009">"वाई-फ़ाई स्कैन"</item>
+    <item msgid="8694611243479480497">"नोटिफिकेशन"</item>
     <item msgid="7776439107987345446">"सेल स्कैन"</item>
     <item msgid="514615766544675057">"फ़ोन पर कॉल करें"</item>
     <item msgid="8181415497109310680">"SMS पढ़ें"</item>
@@ -258,7 +261,7 @@
     <item msgid="587124103118495063">"ICC SMS लिखें"</item>
     <item msgid="2320577158869025503">"सेटिंग बदलें"</item>
     <item msgid="1545733463471924009">"ऊपर बनाएं"</item>
-    <item msgid="3609046903962454582">"सूचनाओं को एक्सेस करें"</item>
+    <item msgid="3609046903962454582">"नोटिफिकेशन को एक्सेस करें"</item>
     <item msgid="4671646036128214513">"कैमरा"</item>
     <item msgid="1097324338692486211">"ऑडियो रिकॉर्ड करें"</item>
     <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
@@ -271,12 +274,15 @@
     <item msgid="4270236897655923007">"रिंग आवाज़"</item>
     <item msgid="6325739889222559394">"मीडिया वॉल्‍यूम"</item>
     <item msgid="5762123934816216821">"अलार्म आवाज़"</item>
-    <item msgid="785049718065337473">"सूचना वॉल्‍यूम"</item>
+    <item msgid="785049718065337473">"नोटिफिकेशन वॉल्‍यूम"</item>
     <item msgid="6700305533746877052">"bluetooth आवाज़"</item>
-    <item msgid="3810969981743709839">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
-    <item msgid="2627903914574908209">"सक्रिय रखें"</item>
-    <item msgid="1395372654968157578">"स्थान की निगरानी करें"</item>
-    <item msgid="3238451051299611853">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+    <item msgid="2029227495214047094">"सचेत रखें"</item>
+    <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
+    <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+    <item msgid="3356591542543137332">"उपयोग के आंकड़े प्राप्त करें"</item>
+    <item msgid="3073734345226842233">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+    <item msgid="1148142988678569310">"प्रोजेक्ट मीडिया"</item>
+    <item msgid="9130014005474445273">"VPN सक्रिय करें"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -290,7 +296,7 @@
     <item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
     <item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
     <item msgid="1638204101698708656">"स्थान"</item>
-    <item msgid="2154671955760380322">"सूचना पोस्ट करें"</item>
+    <item msgid="2154671955760380322">"नोटिफिकेशन पोस्ट करें"</item>
     <item msgid="4282477730595931828">"स्थान"</item>
     <item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
     <item msgid="2623604824935968113">"SMS/MMS पढ़ें"</item>
@@ -304,7 +310,7 @@
     <item msgid="4370895547001583812">"SMS/MMS लिखें"</item>
     <item msgid="4218544235221631789">"सेटिंग बदलें"</item>
     <item msgid="736541391767350377">"ऊपर बनाएं"</item>
-    <item msgid="5530815681721654194">"सूचनाओं को एक्सेस करें"</item>
+    <item msgid="5530815681721654194">"नोटिफिकेशन को एक्सेस करें"</item>
     <item msgid="781213371706962767">"कैमरा"</item>
     <item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
     <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
@@ -317,12 +323,15 @@
     <item msgid="7983336752371254444">"रिंग आवाज़"</item>
     <item msgid="7878027809189330917">"मीडिया वॉल्‍यूम"</item>
     <item msgid="7260546305036218513">"अलार्म आवाज़"</item>
-    <item msgid="9103719301075748925">"सूचना वॉल्‍यूम"</item>
-    <item msgid="7025966722295861512">"Bluetooth वॉल्‍यूम"</item>
-    <item msgid="2265317984004577529">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
-    <item msgid="3646325683886507917">"सक्रिय रखें"</item>
+    <item msgid="9103719301075748925">"नोटिफिकेशन वॉल्‍यूम"</item>
+    <item msgid="7025966722295861512">"ब्लूटूथ वॉल्‍यूम"</item>
+    <item msgid="4665183401128289653">"सचेत रखें"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
     <item msgid="7669257279311110599">"स्थान"</item>
-    <item msgid="7745724368696313169">"स्थान"</item>
+    <item msgid="3459320345690097795">"उपयोग के आंकड़े प्राप्त करें"</item>
+    <item msgid="1312534577834048535">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+    <item msgid="5906017727368097853">"प्रोजेक्ट मीडिया"</item>
+    <item msgid="2486614710846178542">"VPN सक्रिय करें"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"सामान्य"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"मोनोस्पेस"</item>
-    <item msgid="6857338041963571301">"कैज़ुअल"</item>
-    <item msgid="961716102408512888">"कर्सिव"</item>
-    <item msgid="784581717183349567">"स्माल कैपिटल"</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">"बहुत छोटा"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K प्रति लॉग बफ़र"</item>
     <item msgid="2822309747675758628">"256K प्रति लॉग बफ़र"</item>
@@ -487,8 +502,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"बंद"</item>
-    <item msgid="5656544177755411222">"सीमित रुकावटें"</item>
-    <item msgid="8735337502532332056">"शून्य रुकावटें"</item>
+    <item msgid="5656544177755411222">"कॉल और मैसेज को कभी कभी रोकें"</item>
+    <item msgid="8735337502532332056">"कॉल और मैसेज को कभी ना रोकें"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"सामान्य"</item>
@@ -510,6 +525,21 @@
     <item msgid="2860945127596974299">"अंतिम गतिविधि"</item>
     <item msgid="8610560843693675830">"संचित (गतिविधि)"</item>
     <item msgid="4338089220026248848">"संचित (गतिविधि क्लाइंट)"</item>
-    <item msgid="6652164677254579050">"संचित (रिक्त)"</item>
+    <item msgid="6652164677254579050">"संचित (खाली)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"हरा-नीला"</item>
+    <item msgid="8332294763632946560">"नीला"</item>
+    <item msgid="2023216417616991392">"गहरा नीला"</item>
+    <item msgid="3170497246594232819">"बैंगनी"</item>
+    <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 ea02e5a..6a058f1 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>
@@ -137,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>
@@ -156,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>
@@ -276,8 +267,8 @@
     <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="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>
@@ -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">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,35 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"उन्नत ब्लूटूथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लूटूथ के चालू होने पर, आपका डिवाइस आसपास के अन्य ब्लूटूथ डिवाइसों से संचार कर सकता है."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाई-फ़ाई डायरेक्ट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"अतिरिक्त सेटिंग"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"ऐप्स दिखाएं"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"वाई-फाई शक्ति दिखाएं"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"नेटवर्क याद रखें"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क भूलें"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -694,8 +667,8 @@
     <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>
@@ -716,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"वाई-फ़ाई कॉलिंग मोड"</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>
+    <item msgid="3132912693346866895">"केवल वाई-फ़ाई"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"बंद"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"वाई-फ़ाई को प्राथमिकता (वाई-फ़ाई उपलब्‍ध ना होने पर ही सेल नेटवर्क का उपयोग करती है)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"सेल्‍युलर को प्राथमिकता (सेल नेटवर्क उपलब्‍ध ना होने पर ही वाई-फ़ाई का उपयोग करती है)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"केवल वाई-फ़ाई (कभी भी सेल नेटवर्क का उपयोग नहीं करती. वाई-फ़ाई ना हो तो कॉल करना या पाना संभव नहीं)"</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 +806,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>
@@ -859,7 +854,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"बैटरी स्‍थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बैटरी स्‍तर"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"यह नेटवर्किंग से संंबंधित सभी सेटिंग को फैक्टरी डिफ़ॉल्ट में रीसेट कर देगा, इसमें निम्न शामिल हैं:\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="1745138973574945389">"सभी नेटवर्क सेटिंग को रीसेट करना है? आप इस कार्रवाई को वापस पहले जैसा नहीं कर सकते!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग रीसेट करें"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"आपको नेटवर्क सेटिंग रीसेट की पुष्टि करने के लिए अपने अनलॉक पैटर्न का आरेख बनाना होगा."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करें?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"नेटवर्क सेटिंग रीसेट कर दी गई"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"स्‍थान निर्धारित करने के लिए GPS का उपयोग करें"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्‍कैन करना"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्‍कैन करना"</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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1253,7 +1257,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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1593,7 +1597,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -1899,7 +1907,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>
@@ -1947,10 +1955,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>
@@ -2026,6 +2034,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>
@@ -2139,7 +2151,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>
@@ -2167,7 +2179,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"ऐप्‍स डाउनलोड ऐप्‍लिकेशन सिस्‍टम"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ऐप्स अनुमति सुरक्षा"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d ऐप्‍स शर्तें प्रदान करते हैं</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"सभी ऐप्‍स में प्राथमिकताओं को डिफ़ॉल्‍ट पर रीसेट करें"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"सिस्‍टम और डाउनलोड किए गए ऐप्‍स सहित, <xliff:g id="COUNT">%d</xliff:g> ऐप्‍स इंस्‍टॉल किए गए हैं"</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>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 3639894..06806f5 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Uvijek"</item>
     <item msgid="844721238536786870">"Samo kad je uključeno"</item>
-    <item msgid="2990218920631468642">"Nikada (povećava upotrebu podataka)"</item>
+    <item msgid="1986753720941888596">"Nikad"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Uvijek"</item>
     <item msgid="7433294150916905997">"Samo kad je uključeno"</item>
     <item msgid="1390404486722375028">"Nikad"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Posljednjih 30 dana"</item>
+    <item msgid="6600989128423965319">"Postavi ciklus uporabe..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatski"</item>
+    <item msgid="1013988753804838790">"Automatski"</item>
     <item msgid="6670588712989942178">"Samo 5 GHz"</item>
     <item msgid="2715516524973207876">"Samo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Vrijeme upotrebe"</item>
-    <item msgid="3703676222230317933">"Pokreni brojanje"</item>
+    <item msgid="4796160515314745154">"Posljednja upotreba"</item>
     <item msgid="2502754479975776899">"Naziv aplikacije"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"glasnoća alarma"</item>
     <item msgid="785049718065337473">"glasnoća obavijesti"</item>
     <item msgid="6700305533746877052">"glasnoća Bluetootha"</item>
-    <item msgid="3810969981743709839">"isključivanje/uključivanje mikrofona"</item>
-    <item msgid="2627903914574908209">"zadrži u aktivnom stanju"</item>
-    <item msgid="1395372654968157578">"praćenje lokacije"</item>
-    <item msgid="3238451051299611853">"praćenje lokacije s visokom potrošnjom energije"</item>
+    <item msgid="2029227495214047094">"zadrži u aktivnom stanju"</item>
+    <item msgid="26109888160231211">"praćenje lokacije"</item>
+    <item msgid="5753382310468855812">"praćenje lokacije s visokom potrošnjom energije"</item>
+    <item msgid="3356591542543137332">"dohvaćanje statistike o upotrebi"</item>
+    <item msgid="3073734345226842233">"isključivanje/uključivanje mikrofona"</item>
+    <item msgid="1148142988678569310">"projiciranje medija"</item>
+    <item msgid="9130014005474445273">"aktiviraj VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Glasnoća alarma"</item>
     <item msgid="9103719301075748925">"Glasnoća obavijesti"</item>
     <item msgid="7025966722295861512">"Glasnoća Bluetootha"</item>
-    <item msgid="2265317984004577529">"Isključivanje/uključivanje mikrofona"</item>
-    <item msgid="3646325683886507917">"Zadrži u aktivnom stanju"</item>
+    <item msgid="4665183401128289653">"Zadrži u aktivnom stanju"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
     <item msgid="7669257279311110599">"Lokacija"</item>
-    <item msgid="7745724368696313169">"Lokacija"</item>
+    <item msgid="3459320345690097795">"Dohvaćanje statistike o upotrebi"</item>
+    <item msgid="1312534577834048535">"Isključivanje/uključivanje mikrofona"</item>
+    <item msgid="5906017727368097853">"Projiciranje medija"</item>
+    <item msgid="2486614710846178542">"Aktiviraj VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Zadano"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif zgusnuti"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Neproporcionalni"</item>
-    <item msgid="6857338041963571301">"Ležerno"</item>
-    <item msgid="961716102408512888">"Kurziv"</item>
-    <item msgid="784581717183349567">"Mala slova"</item>
+    <item msgid="7247838127505318669">"Fiksna širina bez serifa"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Fiksna širina sa serifima"</item>
+    <item msgid="639503332147461010">"Jednostavno"</item>
+    <item msgid="7967169925231332424">"Kurziv"</item>
+    <item msgid="561832997193039673">"Mala slova"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Vrlo mali"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 KB po međusprem."</item>
     <item msgid="2822309747675758628">"256 KB po međuspr."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Predmemorija (klijent aktivnosti)"</item>
     <item msgid="6652164677254579050">"Predmemorija (prazna)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Tirkiznoplava"</item>
+    <item msgid="8332294763632946560">"Plava"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Ljubičasta"</item>
+    <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 47f40fc..e379ae6 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +319,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>
@@ -350,6 +339,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>
@@ -393,8 +407,6 @@
     <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>
@@ -405,7 +417,6 @@
     <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>
@@ -429,30 +440,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>
@@ -482,15 +499,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>
@@ -518,15 +528,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +583,11 @@
     <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>
@@ -626,6 +610,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Izravni Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skeniraj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Napredno"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Pokaži aplikacije"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Pokaži snagu Wi-Fija"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Poveži s mrežom"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamti mrežu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zaboravi mrežu"</string>
@@ -641,7 +627,7 @@
     <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>
@@ -667,20 +653,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>
@@ -753,6 +734,23 @@
     <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="3208568886184788972">"Način Wi-Fi 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>
+    <item msgid="3132912693346866895">"Samo Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Isključeno"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Prednost ima Wi-Fi mreža (Upotrebljava se samo mobilna mreža ako Wi-Fi nije dostupan.)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Prednost ima mobilna mreža (Upotrebljava se samo Wi-Fi mreža ako mobilna mreža nije dostupna.)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Samo Wi-Fi (Nikad se ne upotrebljava mobilna mreža. Pozivi nisu mogući ako Wi-Fi nije dostupan.)"</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>
@@ -816,6 +814,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>
@@ -867,10 +870,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>
@@ -964,7 +968,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Razina baterije"</string>
@@ -1009,10 +1014,16 @@
     <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="5805796658276223307">"Sve postavke koje se odnose na umrežavanje vratit će se na tvorničko stanje, 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="1745138973574945389">"Želite li poništiti sve postavke mreže? Nećete ih moći vratiti!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Poništi postavke"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Da biste potvrdili poništavanje postavki mreže, trebate nacrtati svoj uzorak za otključavanje."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Poništiti?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Poništavanje postavki mreže"</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>
@@ -1107,6 +1118,8 @@
     <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="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_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>
@@ -1152,7 +1165,7 @@
     <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="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>
@@ -1398,17 +1411,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>
@@ -1447,19 +1449,29 @@
     <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>
@@ -1563,6 +1575,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>
@@ -1704,14 +1717,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>
@@ -1745,12 +1764,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>
@@ -1849,12 +1868,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>
@@ -2026,6 +2043,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>
@@ -2228,13 +2249,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>
@@ -2285,8 +2306,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>
@@ -2351,13 +2372,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>
@@ -2374,6 +2397,9 @@
     <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_all_apps" msgid="5377153522551809915">"aplikacije preuzimanje sustav"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikacije dopuštenja sigurnost"</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>
@@ -2418,29 +2444,33 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d aplikacija pruža uvjete</item>
+      <item quantity="few">%d aplikacije pružaju uvjete</item>
+      <item quantity="other">%d aplikacija pruža uvjete</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>
@@ -2514,4 +2544,38 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Vraćanje postavki na svim aplikacijama na zadano"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Broj instaliranih aplikacija, uključujući aplikacije sustava i preuzete aplikacije: <xliff:g id="COUNT">%d</xliff:g>"</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>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index fd7266a..4747c47 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Mindig"</item>
     <item msgid="844721238536786870">"Csak ha töltőn van"</item>
-    <item msgid="2990218920631468642">"Soha (növeli az adatforgalmat)"</item>
+    <item msgid="1986753720941888596">"Soha"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Mindig"</item>
     <item msgid="7433294150916905997">"Csak ha töltőn van"</item>
     <item msgid="1390404486722375028">"Soha"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Legutóbbi 30 nap"</item>
+    <item msgid="6600989128423965319">"Ciklus beállítása…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatikus"</item>
+    <item msgid="1013988753804838790">"Automatikus"</item>
     <item msgid="6670588712989942178">"Csak 5 GHz"</item>
     <item msgid="2715516524973207876">"Csak 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Használat ideje"</item>
-    <item msgid="3703676222230317933">"Elindítások száma"</item>
+    <item msgid="4796160515314745154">"Utoljára használva"</item>
     <item msgid="2502754479975776899">"Alkalmazás neve"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"ébresztés hangereje"</item>
     <item msgid="785049718065337473">"értesítés hangereje"</item>
     <item msgid="6700305533746877052">"bluetooth hangereje"</item>
-    <item msgid="3810969981743709839">"mikrofon némítása és a némítás feloldása"</item>
-    <item msgid="2627903914574908209">"ébren tartás"</item>
-    <item msgid="1395372654968157578">"hely figyelése"</item>
-    <item msgid="3238451051299611853">"nagy jelerősségű hely figyelése"</item>
+    <item msgid="2029227495214047094">"ébren tartás"</item>
+    <item msgid="26109888160231211">"hely figyelése"</item>
+    <item msgid="5753382310468855812">"magas energiaszintű helyek figyelése"</item>
+    <item msgid="3356591542543137332">"használati statisztikák lekérése"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Hely"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Ébresztés hangereje"</item>
     <item msgid="9103719301075748925">"Értesítés hangereje"</item>
     <item msgid="7025966722295861512">"Bluetooth hangereje"</item>
-    <item msgid="2265317984004577529">"Mikrofon némítása és a némítás feloldása"</item>
-    <item msgid="3646325683886507917">"Ébren tartás"</item>
+    <item msgid="4665183401128289653">"Ébren tartás"</item>
+    <item msgid="8584357129746649222">"Tartózkodási hely"</item>
     <item msgid="7669257279311110599">"Tartózkodási hely"</item>
-    <item msgid="7745724368696313169">"Hely"</item>
+    <item msgid="3459320345690097795">"Használati statisztikák lekérése"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Alapértelmezett"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif, sűrű betűköz"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Alkalmi"</item>
-    <item msgid="961716102408512888">"Kurzív"</item>
-    <item msgid="784581717183349567">"Kiskapitális"</item>
+    <item msgid="7247838127505318669">"Nem proporcionális sans-serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Nem proporcionális serif"</item>
+    <item msgid="639503332147461010">"Általános"</item>
+    <item msgid="7967169925231332424">"Kurzív"</item>
+    <item msgid="561832997193039673">"Kiskapitális"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Nagyon kicsi"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 KB/naplópuffer"</item>
     <item msgid="2822309747675758628">"256 KB/naplópuffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Gyorsítótárazott (tevékenységkliens)"</item>
     <item msgid="6652164677254579050">"Gyorsítótárazott (üres)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Pávakék"</item>
+    <item msgid="8332294763632946560">"Kék"</item>
+    <item msgid="2023216417616991392">"Indigókék"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <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 01652ac..75b5067 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,8 @@
     <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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Keresés"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Speciális"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Alkalmazások"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi-jelerősség"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Csatlakozás hálózathoz"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Hálózat megjegyzése"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Hálózat elfelejtése"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-hívás üzemmód"</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>
+    <item msgid="3132912693346866895">"Csak Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Ki"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi előnyben részesítve (csak akkor használ mobilhálózatot, ha a Wi-Fi nem érhető el)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilhálózat előnyben részesítve (csak akkor használ Wi-Fi-t, ha a mobilhálózat nem érhető el)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Csak Wi-Fi (Nem használ mobilhálózatot. Nem lehet hívásokat indítani vagy fogadni, ha nincs Wi-Fi.)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Akkumulátor állapota"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akkumulátorszint"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Ezzel visszaállítja az összes hálózati beállítást a gyári alapértelmezett értékre, 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="1745138973574945389">"Visszaállítja az összes hálózati beállítást? Ezt a lépést 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_gesture_explanation" msgid="8615374120762720549">"Meg kell adnia a feloldási mintát a hálózati beállítások visszaállításának megerősítéséhez."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Visszaállítja?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Hálózati beállítások visszaá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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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_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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d alkalmazás biztosít feltételeket</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Az összes alkalmazás beállításának visszaállítása az alapértelmezett értékre."</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> alkalmazás telepítve, beleértve a rendszer- és a letöltött alkalmazásokat"</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>
 </resources>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index 755f9ae..5f1a17c 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Միշտ"</item>
     <item msgid="844721238536786870">"Միայն երբ միացված է"</item>
-    <item msgid="2990218920631468642">"Երբեք (մեծացնում է տվյալների օգտագործումը)"</item>
+    <item msgid="1986753720941888596">"Երբեք"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Միշտ"</item>
     <item msgid="7433294150916905997">"Միայն երբ միացված է"</item>
     <item msgid="1390404486722375028">"Երբեք"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Վերջին 30 օրում"</item>
+    <item msgid="6600989128423965319">"Սահմանել օգտագործման ցիկլը..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Ինքնաշխատ"</item>
+    <item msgid="1013988753804838790">"Ինքնուրույն"</item>
     <item msgid="6670588712989942178">"Միայն 5 ԳՀց"</item>
     <item msgid="2715516524973207876">"միայն 2.4 ԳՀց"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Օգտագործման ժամանակը"</item>
-    <item msgid="3703676222230317933">"Գործարկումների թիվը"</item>
+    <item msgid="4796160515314745154">"Վերջին օգտագործումը"</item>
     <item msgid="2502754479975776899">"Ծրագրի անունը"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"զարթուցիչի ձայնի բարձրություն"</item>
     <item msgid="785049718065337473">"ծանուցման ձայնի բարձրություն"</item>
     <item msgid="6700305533746877052">"bluetooth-ի ձայնի բարձրություն"</item>
-    <item msgid="3810969981743709839">"Խոսափողն անջատել/միացնել"</item>
-    <item msgid="2627903914574908209">"արթուն պահել"</item>
-    <item msgid="1395372654968157578">"վերահսկել տեղադրությունը"</item>
-    <item msgid="3238451051299611853">"մշտադիտարկել էներգատար տեղանքները"</item>
+    <item msgid="2029227495214047094">"արթուն պահել"</item>
+    <item msgid="26109888160231211">"վերահսկել տեղադրությունը"</item>
+    <item msgid="5753382310468855812">"մշտադիտարկել էներգատար տեղանքները"</item>
+    <item msgid="3356591542543137332">"ստանալ օգտագործման վիճակագրությունը"</item>
+    <item msgid="3073734345226842233">"խոսափողն անջատել/միացնել"</item>
+    <item msgid="1148142988678569310">"տեսարձակել մեդիան"</item>
+    <item msgid="9130014005474445273">"ակտիվացնել VPN-ը"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Տեղակայում"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Զարթուցիչի ձայնի բարձրություն"</item>
     <item msgid="9103719301075748925">"Ծանուցման ձայնի բարձրություն"</item>
     <item msgid="7025966722295861512">"Bluetooth-ի ձայնի բարձրություն"</item>
-    <item msgid="2265317984004577529">"Խոսափողն անջատել/միացնել"</item>
-    <item msgid="3646325683886507917">"Արթուն պահել"</item>
+    <item msgid="4665183401128289653">"Արթուն պահել"</item>
+    <item msgid="8584357129746649222">"Տեղադրություն"</item>
     <item msgid="7669257279311110599">"Տեղադրություն"</item>
-    <item msgid="7745724368696313169">"Տեղադրություն"</item>
+    <item msgid="3459320345690097795">"Ստանալ օգտագործման վիճակագրությունը"</item>
+    <item msgid="1312534577834048535">"Խոսափողն անջատել/միացնել"</item>
+    <item msgid="5906017727368097853">"Տեսարձակել մեդիան"</item>
+    <item msgid="2486614710846178542">"Ակտիվացնել VPN-ը"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Կարճաժամկետ"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Լռելյայն"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif խտացրած"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Առօրյա"</item>
-    <item msgid="961716102408512888">"Ձեռագիր"</item>
-    <item msgid="784581717183349567">"Փոքր մեծատառեր"</item>
+    <item msgid="7247838127505318669">"Sans-serif միալայնք"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif միալայնք"</item>
+    <item msgid="639503332147461010">"Առօրյա"</item>
+    <item msgid="7967169925231332424">"Ձեռագիր"</item>
+    <item msgid="561832997193039673">"Փոքր մեծատառեր"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Շատ փոքր"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4ՄԲ"</item>
     <item msgid="3025431211013424097">"16ՄԲ"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64ԿԲ"</item>
+    <item msgid="3534782711045262344">"256ԿԲ"</item>
+    <item msgid="8085867209202153403">"1ՄԲ"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"Պահնակ՝ առավ. 64ԿԲ"</item>
     <item msgid="2822309747675758628">"Պահնակ՝ առավ. 256ԿԲ"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Քեշավորված (սպասառուի գործողությունը)"</item>
     <item msgid="6652164677254579050">"Քեշավորված (դատարկ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Փիրուզագույն"</item>
+    <item msgid="8332294763632946560">"Կապույտ"</item>
+    <item msgid="2023216417616991392">"Ինդիգո"</item>
+    <item msgid="3170497246594232819">"Մանուշակագույն"</item>
+    <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 746e7f7..3adab8d 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>
@@ -137,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>
@@ -156,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>
@@ -207,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>
@@ -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="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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Ընդլայնված Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Երբ Bluetooth-ը միացված է, ձեր սարքը կարող է հաղորդակցվել այլ հարակից Bluetooth սարքերի հետ:"</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 +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>
@@ -580,7 +560,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ուղիղ"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Սկանավորում"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ընդլայնված"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Դիտել հավելվածները"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Դիտել WiFi ազդանշանը"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Միանալ ցանցին"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Պահել ցանցը"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Մոռանալ ցանցը"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-ի միջոցով զանգերի ռեժիմ"</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>
+    <item msgid="3132912693346866895">"Միայն Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Անջատված է"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi, նախընտրելի (Օգտագործում է բջջային ցանցը միայն երբ հասանելի Wi-Fi ցանց չկա)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Բջջային, նախընտրելի (Օգտագործում է Wi-Fi-ը միայն երբ հասանելի բջջային ցանց չկա)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Միայն 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Մարտկոցի կարգավիճակը"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Մարտկոցի մակարդակը"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Այս գործողության արդյունքում կվերակայվեն գործարանային կանխադրված արժեքները ցանցային կապակցման բոլոր կարգավորումների համար, ներառյալ՝\n\n"<li>"Wifi"</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="1745138973574945389">"Վերակայե՞լ բոլոր ցանցային կարգավորումները: Այս գործողությունը հնարավոր չի լինի հետարկել:"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Վերակայել կարգավորումները"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Ցանցային կարգավորումների վերակայումը հաստատելու համար անհրաժեշտ է մուտքագրել ապակողպող նախշը:"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Վերակայե՞լ:"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ցանցային կարգավորումները վերակայվեցին"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1133,7 +1137,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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"հավելվածներ ներբեռնել հավելվածներ համակարգ"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d հավելված տրամադրում է պայմաններ</item>
+      <item quantity="other">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Վերակայել կանխադրված նախընտրանքները բոլոր հավելվածներում"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Տեղադրվել է <xliff:g id="COUNT">%d</xliff:g> հավելված (այդ թվում նաև համակարգային և ներբեռնած հավելվածներ)"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Ընտրել պրոֆիլ"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 84c30b6..f9b57c9 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Selalu"</item>
     <item msgid="844721238536786870">"Hanya ketika terhubung ke sumber daya"</item>
-    <item msgid="2990218920631468642">"Tidak pernah (meningkatkan penggunaan data)"</item>
+    <item msgid="1986753720941888596">"Tidak pernah"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Selalu"</item>
     <item msgid="7433294150916905997">"Hanya saat trhbng ke smbr daya"</item>
     <item msgid="1390404486722375028">"Tidak pernah"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 hari terakhir"</item>
+    <item msgid="6600989128423965319">"Setel alur penggunaan..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Otomatis"</item>
+    <item msgid="1013988753804838790">"Otomatis"</item>
     <item msgid="6670588712989942178">"Hanya 5 GHz"</item>
     <item msgid="2715516524973207876">"Hanya 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Waktu penggunaan"</item>
-    <item msgid="3703676222230317933">"Penghitungan peluncuran"</item>
+    <item msgid="4796160515314745154">"Terakhir kali digunakan"</item>
     <item msgid="2502754479975776899">"Nama apl"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -228,7 +231,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>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume alarm"</item>
     <item msgid="785049718065337473">"volume pemberitahuan"</item>
     <item msgid="6700305533746877052">"volume bluetooth"</item>
-    <item msgid="3810969981743709839">"bisukan/suarakan mikrofon"</item>
-    <item msgid="2627903914574908209">"tetap aktif"</item>
-    <item msgid="1395372654968157578">"lokasi monitor"</item>
-    <item msgid="3238451051299611853">"memantau lokasi berdaya tinggi"</item>
+    <item msgid="2029227495214047094">"tetap aktif"</item>
+    <item msgid="26109888160231211">"monitor lokasi"</item>
+    <item msgid="5753382310468855812">"memantau lokasi berdaya tinggi"</item>
+    <item msgid="3356591542543137332">"dapatkan statistik penggunaan"</item>
+    <item msgid="3073734345226842233">"bisukan/suarakan mikrofon"</item>
+    <item msgid="1148142988678569310">"media proyek"</item>
+    <item msgid="9130014005474445273">"aktifkan VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -290,7 +296,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>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume alarm"</item>
     <item msgid="9103719301075748925">"Volume pemberitahuan"</item>
     <item msgid="7025966722295861512">"Volume bluetooth"</item>
-    <item msgid="2265317984004577529">"Bisukan/suarakan mikrofon"</item>
-    <item msgid="3646325683886507917">"Tetap aktif"</item>
+    <item msgid="4665183401128289653">"Tetap aktif"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
     <item msgid="7669257279311110599">"Lokasi"</item>
-    <item msgid="7745724368696313169">"Lokasi"</item>
+    <item msgid="3459320345690097795">"Dapatkan statistik penggunaan"</item>
+    <item msgid="1312534577834048535">"Bisukan/suarakan mikrofon"</item>
+    <item msgid="5906017727368097853">"Media proyek"</item>
+    <item msgid="2486614710846178542">"Aktifkan VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Default"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Santai"</item>
-    <item msgid="961716102408512888">"Kursif"</item>
-    <item msgid="784581717183349567">"Kapital kecil"</item>
+    <item msgid="7247838127505318669">"Sans-serif spasi tunggal"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif spasi tunggal"</item>
+    <item msgid="639503332147461010">"Santai"</item>
+    <item msgid="7967169925231332424">"Kursif"</item>
+    <item msgid="561832997193039673">"Kapital kecil"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Sangat kecil"</item>
@@ -375,6 +385,11 @@
     <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/penyangga log"</item>
     <item msgid="2822309747675758628">"256 K/penyangga log"</item>
@@ -433,7 +448,7 @@
     <item msgid="3191973083884253830">"Tidak ada"</item>
     <item msgid="9089630089455370183">"Logcat"</item>
     <item msgid="5397807424362304288">"Systrace (Grafis)"</item>
-    <item msgid="1340692776955662664">"Panggil tumpukan di glGetError"</item>
+    <item msgid="1340692776955662664">"Telepon tumpukan di glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Nonaktif"</item>
@@ -506,10 +521,25 @@
     <item msgid="7438189122367820362">"Layanan (berjalan)"</item>
     <item msgid="918687422516982498">"Layanan (memulai ulang)"</item>
     <item msgid="6807727069641853029">"Penerima"</item>
-    <item msgid="6782857406100845127">"Utama"</item>
+    <item msgid="6782857406100845127">"Beranda"</item>
     <item msgid="2860945127596974299">"Aktivitas terakhir"</item>
     <item msgid="8610560843693675830">"Disimpan dalam cache (aktivitas)"</item>
     <item msgid="4338089220026248848">"Disimpan dalam cache (klien aktivitas)"</item>
     <item msgid="6652164677254579050">"Disimpan dalam cache (kosong)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Hijau kebiruan"</item>
+    <item msgid="8332294763632946560">"Biru"</item>
+    <item msgid="2023216417616991392">"Nila"</item>
+    <item msgid="3170497246594232819">"Ungu"</item>
+    <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 8d3f786..4905bf0 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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">"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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Langsung"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Pindai"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lanjutan"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Tampilkan Aplikasi"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Tampilkan Kekuatan Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Hubungkan ke jaringan"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Ingat jaringan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Mode panggilan Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Khusus Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Nonaktif"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi dipilih (Menggunakan jaringan seluler hanya jika Wi-Fi tidak tersedia)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Seluler dipilih (Hanya menggunakan Wi-Fi jika jaringan seluler tidak tersedia)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Khusus Wi-Fi (Tidak pernah menggunakan jaringan seluler. Tidak dapat melakukan atau menerima panggilan telepon jika Wi-Fi tidak tersedia)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Status baterai"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Tingkat baterai"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Tindakan ini akan mengatur ulang semua setelan yang terkait dengan sambungan jaringan ke default pabrik, 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="1745138973574945389">"Atur ulang semua setelan jaringan? Anda tidak dapat membalikkan tindakan ini!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Atur ulang setelan"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Anda perlu membuat pola pembuka kunci untuk mengonfirmasi pengaturan ulang setelan jaringan."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setel ulang?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Setelan jaringan diatur 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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"apl unduh aplikasi sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"aplikasi izin keamanan"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplikasi memberikan ketentuan</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Menyetel ulang preferensi di semua aplikasi menjadi default"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplikasi dipasang, termasuk aplikasi sistem dan yang diunduh"</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> 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>
 </resources>
diff --git a/res/xml/quick_launch_settings.xml b/res/values-is-rIS-nokeys/strings.xml
similarity index 61%
copy from res/xml/quick_launch_settings.xml
copy to res/values-is-rIS-nokeys/strings.xml
index eb5585c..f529518 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/values-is-rIS-nokeys/strings.xml
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
+ -->
 
-<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>   
+<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">"Stjórna forritum"</string>
+</resources>
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is-rIS/arrays.xml
index a60b8cf..edcf57f 100644
--- a/res/values-is-rIS/arrays.xml
+++ b/res/values-is-rIS/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Alltaf"</item>
     <item msgid="844721238536786870">"Aðeins þegar tækið er í sambandi"</item>
-    <item msgid="2990218920631468642">"Aldrei (eykur gagnanotkun)"</item>
+    <item msgid="1986753720941888596">"Aldrei"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Alltaf"</item>
     <item msgid="7433294150916905997">"Aðeins þegar tækið er í sambandi"</item>
     <item msgid="1390404486722375028">"Aldrei"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Síðustu 30 dagar"</item>
+    <item msgid="6600989128423965319">"Velja notkunartímabil..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Sjálfvirkt"</item>
+    <item msgid="1013988753804838790">"Sjálfvirkt"</item>
     <item msgid="6670588712989942178">"Aðeins 5 GHz"</item>
     <item msgid="2715516524973207876">"Aðeins 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Notkunartími"</item>
-    <item msgid="3703676222230317933">"Fjöldi ræsinga"</item>
+    <item msgid="4796160515314745154">"Síðast notað"</item>
     <item msgid="2502754479975776899">"Heiti forrits"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"hljóðstyrkur vekjara"</item>
     <item msgid="785049718065337473">"hljóðstyrkur tilkynninga"</item>
     <item msgid="6700305533746877052">"hljóðstyrkur bluetooth"</item>
-    <item msgid="3810969981743709839">"kveikja/slökkva á hljóðnema"</item>
-    <item msgid="2627903914574908209">"ekki fara í biðstöðu"</item>
-    <item msgid="1395372654968157578">"fylgjast með staðsetningu"</item>
-    <item msgid="3238451051299611853">"fylgjast með staðsetningum með miklum styrk"</item>
+    <item msgid="2029227495214047094">"ekki fara í biðstöðu"</item>
+    <item msgid="26109888160231211">"fylgjast með staðsetningu"</item>
+    <item msgid="5753382310468855812">"fylgjast með staðsetningum með miklum styrk"</item>
+    <item msgid="3356591542543137332">"fá talnagögn um notkun"</item>
+    <item msgid="3073734345226842233">"kveikja/slökkva á hljóðnema"</item>
+    <item msgid="1148142988678569310">"margmiðlunarefni verkefnis"</item>
+    <item msgid="9130014005474445273">"virkja VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Staðsetning"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Hljóðstyrkur vekjara"</item>
     <item msgid="9103719301075748925">"Hljóðstyrkur tilkynninga"</item>
     <item msgid="7025966722295861512">"Hljóðstyrkur Bluetooth"</item>
-    <item msgid="2265317984004577529">"Kveikja/slökkva á hljóðnema"</item>
-    <item msgid="3646325683886507917">"Ekki fara í biðstöðu"</item>
+    <item msgid="4665183401128289653">"Ekki fara í biðstöðu"</item>
+    <item msgid="8584357129746649222">"Staðsetning"</item>
     <item msgid="7669257279311110599">"Staðsetning"</item>
-    <item msgid="7745724368696313169">"Staðsetning"</item>
+    <item msgid="3459320345690097795">"Fá talnagögn um notkun"</item>
+    <item msgid="1312534577834048535">"Kveikja/slökkva á hljóðnema"</item>
+    <item msgid="5906017727368097853">"Margmiðlunarefni verkefnis"</item>
+    <item msgid="2486614710846178542">"Virkja VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Stutt"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Sjálfgefið"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Þjappað sans-serif"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Jafnbreitt"</item>
-    <item msgid="6857338041963571301">"Óformlegt"</item>
-    <item msgid="961716102408512888">"Tengt"</item>
-    <item msgid="784581717183349567">"Litlir hástafir"</item>
+    <item msgid="7247838127505318669">"Sans-serif jafnbreitt"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif jafnbreitt"</item>
+    <item msgid="639503332147461010">"Óformlegt"</item>
+    <item msgid="7967169925231332424">"Tengt"</item>
+    <item msgid="561832997193039673">"Litlir hástafir"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Mjög lítið"</item>
@@ -375,6 +385,11 @@
     <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/biðminni"</item>
     <item msgid="2822309747675758628">"256 k/biðminni"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Í skyndiminni (virknibiðlari)"</item>
     <item msgid="6652164677254579050">"Í skyndiminni (autt)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blágrænn"</item>
+    <item msgid="8332294763632946560">"Blár"</item>
+    <item msgid="2023216417616991392">"Dimmfjólublár"</item>
+    <item msgid="3170497246594232819">"Fjólublár"</item>
+    <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 1f4f220..574cf98 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Leita"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Ítarlegt"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Sýna forrit"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Sýna styrk Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Tengt við net"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Vista net"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Gleyma neti"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi símtöl"</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>
+    <item msgid="3132912693346866895">"Wi-Fi eingöngu"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Slökkt"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi í forgangi (notar aðeins farsímakerfi ef Wi-Fi er ekki í boði)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Farsímakerfi í forgangi (notar aðeins Wi-Fi ef farsímakerfi er ekki í boði)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi eingöngu (notar aldrei farsímakerfi. Ekki hægt að hringja eða svara ef Wi-Fi er ekki í boði)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Staða rafhlöðu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Staða rafhlöðu"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Þetta færir allar stillingar sem tengjast netum aftur í sjálfgildi framleiðanda, þ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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Þú þarft að teikna opnunarmynstrið til að staðfesta endurstillingu netstillinga."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Endurstilla?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Netstillingar 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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"forrit sækja niðurhal kerfi"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"öryggi forritsheimilda"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d forrit setur skilyrði</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Endurstilla stillingar allra forrita í sjálfgildi sín"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> forrit uppsett, þar með talin kerfisforrit og sótt forrit"</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>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 70bda01..06d541c 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
     <item msgid="844721238536786870">"Solo quando collegato"</item>
-    <item msgid="2990218920631468642">"Mai (aumenta l\'utilizzo dei dati)"</item>
+    <item msgid="1986753720941888596">"Mai"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
     <item msgid="7433294150916905997">"Solo quando collegato"</item>
     <item msgid="1390404486722375028">"Mai"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Ultimi 30 giorni"</item>
+    <item msgid="6600989128423965319">"Imp. ciclo di utilizzo..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatica"</item>
+    <item msgid="1013988753804838790">"Automatico"</item>
     <item msgid="6670588712989942178">"Solo 5 GHz"</item>
     <item msgid="2715516524973207876">"Solo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Tempo di utilizzo"</item>
-    <item msgid="3703676222230317933">"Conteggio avvii"</item>
+    <item msgid="4796160515314745154">"Data ultimo utilizzo:"</item>
     <item msgid="2502754479975776899">"Nome applicazione"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -270,13 +273,16 @@
     <item msgid="7136963238377062018">"volume voce"</item>
     <item msgid="4270236897655923007">"volume suoneria"</item>
     <item msgid="6325739889222559394">"volume contenuti multimediali"</item>
-    <item msgid="5762123934816216821">"volume allarme"</item>
+    <item msgid="5762123934816216821">"volume sveglia"</item>
     <item msgid="785049718065337473">"volume notifiche"</item>
     <item msgid="6700305533746877052">"volume bluetooth"</item>
-    <item msgid="3810969981743709839">"attiva/disattiva microfono"</item>
-    <item msgid="2627903914574908209">"mantieni attivo"</item>
-    <item msgid="1395372654968157578">"monitora posizione"</item>
-    <item msgid="3238451051299611853">"monitora posizione a consumo elevato"</item>
+    <item msgid="2029227495214047094">"mantieni attivo"</item>
+    <item msgid="26109888160231211">"monitora posizione"</item>
+    <item msgid="5753382310468855812">"monitora localizzazione a consumo elevato"</item>
+    <item msgid="3356591542543137332">"ricevi statistiche sull\'utilizzo"</item>
+    <item msgid="3073734345226842233">"attiva/disattiva microfono"</item>
+    <item msgid="1148142988678569310">"elementi multimediali dei progetti"</item>
+    <item msgid="9130014005474445273">"attiva VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Posizione"</item>
@@ -316,13 +322,16 @@
     <item msgid="5660213838861789350">"Volume voce"</item>
     <item msgid="7983336752371254444">"Volume suoneria"</item>
     <item msgid="7878027809189330917">"Volume contenuti multimediali"</item>
-    <item msgid="7260546305036218513">"Volume allarme"</item>
+    <item msgid="7260546305036218513">"Volume sveglia"</item>
     <item msgid="9103719301075748925">"Volume notifiche"</item>
     <item msgid="7025966722295861512">"Volume Bluetooth"</item>
-    <item msgid="2265317984004577529">"Attiva/disattiva microfono"</item>
-    <item msgid="3646325683886507917">"Mantieni attivo"</item>
+    <item msgid="4665183401128289653">"Mantieni attivo"</item>
+    <item msgid="8584357129746649222">"Posizione"</item>
     <item msgid="7669257279311110599">"Geolocalizzazione"</item>
-    <item msgid="7745724368696313169">"Posizione"</item>
+    <item msgid="3459320345690097795">"Ricevi statistiche sull\'utilizzo"</item>
+    <item msgid="1312534577834048535">"Attiva/disattiva microfono"</item>
+    <item msgid="5906017727368097853">"Elementi multimediali dei progetti"</item>
+    <item msgid="2486614710846178542">"Attiva VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predefinito"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Informale"</item>
-    <item msgid="961716102408512888">"Corsivo"</item>
-    <item msgid="784581717183349567">"Maiuscoletto"</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">"Corsivo"</item>
+    <item msgid="561832997193039673">"Maiuscoletto"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Molto piccole"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Usa impostazioni predefinite app"</item>
+    <item msgid="7009918361545506251">"Impostazioni predefinite app"</item>
     <item msgid="1770533843436933500">"Bianco su nero"</item>
     <item msgid="758587126802411846">"Nero su bianco"</item>
     <item msgid="1495307195241623402">"Giallo su nero"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 kB/buffer log"</item>
     <item msgid="2822309747675758628">"256 kB/buffer log"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Memorizzata nella cache (client attività)"</item>
     <item msgid="6652164677254579050">"Memorizzata nella cache (vuoto)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Verde acqua"</item>
+    <item msgid="8332294763632946560">"Blu"</item>
+    <item msgid="2023216417616991392">"Indaco"</item>
+    <item msgid="3170497246594232819">"Viola"</item>
+    <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 4159a70..2aed951 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scansione"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzate"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostra app"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostra intensità Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Memorizza rete"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modalità di chiamata Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Solo Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Non attive"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Rete preferita: Wi-Fi (utilizza la rete cellulare solo se il Wi-Fi non è disponibile)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Rete preferita: cellulare (utilizza il Wi-Fi solo se la rete cellulare non è disponibile)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Solo Wi-Fi (non usa mai la rete cell. Non può eseguire/ricevere chiamate se il Wi-Fi non è dispon.)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Livello batteria"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Questa operazione determina il ripristino delle impostazioni predefinte di fabbrica per la rete, di conseguenza riguarda anche le seguenti opzioni: \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="1745138973574945389">"Reimpostare tutte le impostazioni di rete? L\'operazione non potrà essere annullata."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Reimposta impostazioni"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Devi tracciare la sequenza di sblocco per confermare la reimpostazione della rete."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Reimpostare?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Reimpostazione della rete"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"download app applicazioni sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sicurezza delle autorizzazioni 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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d app forniscono condizioni</item>
+      <item quantity="one">%d app fornisce 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Ripristina le preferenze predefinite di tutte le app"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> app installate, incluse app di sistema e scaricate"</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>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 80aeb7f..cd2f2f0 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"תמיד"</item>
     <item msgid="844721238536786870">"רק כאשר המכשיר מחובר"</item>
-    <item msgid="2990218920631468642">"לעולם לא (מגדיל שימוש בנתונים)"</item>
+    <item msgid="1986753720941888596">"אף פעם"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"תמיד"</item>
     <item msgid="7433294150916905997">"רק כאשר המכשיר מחובר"</item>
     <item msgid="1390404486722375028">"לעולם לא"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 הימים האחרונים"</item>
+    <item msgid="6600989128423965319">"הגדר מחזור שימוש..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"אוטומטי"</item>
+    <item msgid="1013988753804838790">"אוטומטי"</item>
     <item msgid="6670588712989942178">"‏‎5 GHz בלבד"</item>
     <item msgid="2715516524973207876">"‏‎2.4 GHz בלבד"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"זמן שימוש"</item>
-    <item msgid="3703676222230317933">"הפעל ספירה"</item>
+    <item msgid="4796160515314745154">"מועד שימוש אחרון"</item>
     <item msgid="2502754479975776899">"שם האפליקציה"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -242,7 +245,7 @@
     <item msgid="7638002295329050091">"קרא יומן שיחות"</item>
     <item msgid="6546959730920410907">"שנה יומן שיחות"</item>
     <item msgid="446877710771379667">"קרא יומן"</item>
-    <item msgid="7674458294386319722">"שנה לוח שנה"</item>
+    <item msgid="7674458294386319722">"שנה יומן"</item>
     <item msgid="8281201165558093009">"‏סריקת Wi-Fi"</item>
     <item msgid="8694611243479480497">"התראה"</item>
     <item msgid="7776439107987345446">"סריקה סלולרית"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"עוצמת קול של התרעה"</item>
     <item msgid="785049718065337473">"עוצמת קול של התראה"</item>
     <item msgid="6700305533746877052">"‏עוצמת קול של Bluetooth"</item>
-    <item msgid="3810969981743709839">"השתק/בטל השתקה של המיקרופון"</item>
-    <item msgid="2627903914574908209">"שמור במצב פעיל"</item>
-    <item msgid="1395372654968157578">"עקוב אחר מיקום"</item>
-    <item msgid="3238451051299611853">"מעקב אחר מיקום עם צריכת סוללה גבוהה"</item>
+    <item msgid="2029227495214047094">"שמור במצב פעיל"</item>
+    <item msgid="26109888160231211">"עקוב אחר מיקום"</item>
+    <item msgid="5753382310468855812">"מעקב אחר מיקום עם צריכת סוללה גבוהה"</item>
+    <item msgid="3356591542543137332">"קבל סטטיסטיקת שימוש"</item>
+    <item msgid="3073734345226842233">"השתק/בטל השתקה של המיקרופון"</item>
+    <item msgid="1148142988678569310">"הקרן מדיה"</item>
+    <item msgid="9130014005474445273">"‏הפעל VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"מיקום"</item>
@@ -288,7 +294,7 @@
     <item msgid="7928393476362362538">"קרא יומן שיחות"</item>
     <item msgid="6248591205254641116">"שנה יומן שיחות"</item>
     <item msgid="6093344633066170692">"קרא יומן"</item>
-    <item msgid="1334886368750347692">"שנה לוח שנה"</item>
+    <item msgid="1334886368750347692">"שנה יומן"</item>
     <item msgid="1638204101698708656">"מיקום"</item>
     <item msgid="2154671955760380322">"פרסם התראה"</item>
     <item msgid="4282477730595931828">"מיקום"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
     <item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
     <item msgid="7025966722295861512">"‏עוצמת קול של Bluetooth"</item>
-    <item msgid="2265317984004577529">"השתק/בטל השתקה של המיקרופון"</item>
-    <item msgid="3646325683886507917">"שמור במצב פעיל"</item>
+    <item msgid="4665183401128289653">"שמור במצב פעיל"</item>
+    <item msgid="8584357129746649222">"מיקום"</item>
     <item msgid="7669257279311110599">"מיקום"</item>
-    <item msgid="7745724368696313169">"מיקום"</item>
+    <item msgid="3459320345690097795">"קבל סטטיסטיקת שימוש"</item>
+    <item msgid="1312534577834048535">"השתק/בטל השתקה של המיקרופון"</item>
+    <item msgid="5906017727368097853">"הקרן מדיה"</item>
+    <item msgid="2486614710846178542">"‏הפעל VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ברירת מחדל"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"‏Sans-serif דחוס"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"רווח יחיד"</item>
-    <item msgid="6857338041963571301">"רגיל"</item>
-    <item msgid="961716102408512888">"מחובר"</item>
-    <item msgid="784581717183349567">"רישיות קטנות"</item>
+    <item msgid="7247838127505318669">"‏Sans-serif עם רווח יחיד"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"‏Serif עם רווח יחיד"</item>
+    <item msgid="639503332147461010">"Casual"</item>
+    <item msgid="7967169925231332424">"כתב-יד"</item>
+    <item msgid="561832997193039673">"רישיות קטנות"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"קטן מאוד"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"‎256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"‏64K לכל מאגר יומן"</item>
     <item msgid="2822309747675758628">"‏256K לכל מאגר יומן"</item>
@@ -488,7 +503,7 @@
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"כבוי"</item>
     <item msgid="5656544177755411222">"הפרעות מוגבלות"</item>
-    <item msgid="8735337502532332056">"אפס הפרעות"</item>
+    <item msgid="8735337502532332056">"ללא הפרעות"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"רגיל"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"בקובץ שמור (לקוח פעילות)"</item>
     <item msgid="6652164677254579050">"בקובץ שמור (ריק)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"כחול-ירקרק"</item>
+    <item msgid="8332294763632946560">"כחול"</item>
+    <item msgid="2023216417616991392">"כחול כהה"</item>
+    <item msgid="3170497246594232819">"סגול"</item>
+    <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 59eb17a..3f55357 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>
@@ -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."</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>
@@ -327,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>
@@ -350,6 +340,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>
@@ -393,8 +409,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>
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"‏Bluetooth מתקדם"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"‏כשקישוריות ה-Bluetooth פועלת, המכשיר יכול לתקשר עם מכשירי Bluetooth אחרים."</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 +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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"סרוק"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"מתקדם"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"הצג אפליקציות"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏הצג עוצמת Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"זכור את הרשת"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"שכח רשת"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"‏מצב שיחות ב-Wi-Fi"</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>
+    <item msgid="3132912693346866895">"‏Wi-Fi בלבד"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"כבוי"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏Wi-Fi מועדף (שימוש ברשת סלולרית רק אם Wi-Fi אינו זמין)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏סלולרי מועדף (שימוש ב-Wi-Fi רק אם רשת סלולרית אינה זמינה)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"מצב סוללה"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"טעינת סוללה:"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"‏הפעולה הזו תאפס להגדרות היצרן את כל ההגדרות הקשורות לתקשורת רשתות, כולל:\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="1745138973574945389">"האם לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"אפס הגדרות"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"עליך לשרטט את קו ביטול הנעילה כדי לאשר איפוס של הגדרות הרשת."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"האם לאפס?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"הגדרות הרשת אופסו"</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>
@@ -1107,6 +1127,8 @@
     <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_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,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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 +1726,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>
@@ -1750,7 +1778,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>
@@ -1849,12 +1877,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 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_all_apps" msgid="5377153522551809915">"מערכת לבקשה של הורדת אפליקציות"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"אבטחה של הרשאות לאפליקציות"</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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="two">‏%d אפליקציות מספקות תנאים</item>
+      <item quantity="many">‏%d אפליקציות מספקות תנאים</item>
+      <item quantity="other">‏%d אפליקציות מספקות תנאים</item>
+      <item quantity="one">‏אפליקציה %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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"אפס לברירת המחדל את ההעדפות בכל האפליקציות"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> אפליקציות מותקנות, כולל אפליקציות מערכת ואפליקציות שהורדת"</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>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 8449cc4..cdcc1cd 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"常に使用する"</item>
     <item msgid="844721238536786870">"電源接続時にのみ使用する"</item>
-    <item msgid="2990218920631468642">"使用しない（データ使用量が増加）"</item>
+    <item msgid="1986753720941888596">"スリープにしない"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"常に使用"</item>
     <item msgid="7433294150916905997">"電源接続時にのみ使用する"</item>
     <item msgid="1390404486722375028">"使用しない"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"過去30日間"</item>
+    <item msgid="6600989128423965319">"使用サイクルを設定..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"自動"</item>
+    <item msgid="1013988753804838790">"自動"</item>
     <item msgid="6670588712989942178">"5 GHzのみ"</item>
     <item msgid="2715516524973207876">"2.4 GHzのみ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"使用時間"</item>
-    <item msgid="3703676222230317933">"起動回数"</item>
+    <item msgid="4796160515314745154">"前回の使用"</item>
     <item msgid="2502754479975776899">"アプリ名"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"アラームの音量"</item>
     <item msgid="785049718065337473">"通知音量"</item>
     <item msgid="6700305533746877052">"Bluetoothの音量"</item>
-    <item msgid="3810969981743709839">"マイクをミュート/ミュート解除"</item>
-    <item msgid="2627903914574908209">"スリープモードにしない"</item>
-    <item msgid="1395372654968157578">"場所を監視"</item>
-    <item msgid="3238451051299611853">"高精度の現在地情報を監視"</item>
+    <item msgid="2029227495214047094">"スリープモードにしない"</item>
+    <item msgid="26109888160231211">"場所を監視"</item>
+    <item msgid="5753382310468855812">"高精度の現在地情報を監視"</item>
+    <item msgid="3356591542543137332">"使用統計情報を取得"</item>
+    <item msgid="3073734345226842233">"マイクをミュート/ミュート解除"</item>
+    <item msgid="1148142988678569310">"メディアプロジェクション"</item>
+    <item msgid="9130014005474445273">"VPNの有効化"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置情報"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"アラームの音量"</item>
     <item msgid="9103719301075748925">"通知の音量"</item>
     <item msgid="7025966722295861512">"Bluetoothの音量"</item>
-    <item msgid="2265317984004577529">"マイクをミュート/ミュート解除"</item>
-    <item msgid="3646325683886507917">"スリープモードにしない"</item>
+    <item msgid="4665183401128289653">"スリープモードにしない"</item>
+    <item msgid="8584357129746649222">"場所"</item>
     <item msgid="7669257279311110599">"現在地"</item>
-    <item msgid="7745724368696313169">"場所"</item>
+    <item msgid="3459320345690097795">"使用統計情報を取得"</item>
+    <item msgid="1312534577834048535">"マイクをミュート/ミュート解除"</item>
+    <item msgid="5906017727368097853">"メディアプロジェクション"</item>
+    <item msgid="2486614710846178542">"VPNの有効化"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"デフォルト"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif Condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"固定幅"</item>
-    <item msgid="6857338041963571301">"カジュアル"</item>
-    <item msgid="961716102408512888">"草書体"</item>
-    <item msgid="784581717183349567">"スモールキャピタル"</item>
+    <item msgid="7247838127505318669">"Sans Serif固定幅"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif固定幅"</item>
+    <item msgid="639503332147461010">"カジュアル"</item>
+    <item msgid="7967169925231332424">"草書体"</item>
+    <item msgid="561832997193039673">"スモールキャピタル"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"極小"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K/ログバッファ"</item>
     <item msgid="2822309747675758628">"256K/ログバッファ"</item>
@@ -487,8 +502,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"OFF"</item>
-    <item msgid="5656544177755411222">"制限付き中断"</item>
-    <item msgid="8735337502532332056">"中断なし"</item>
+    <item msgid="5656544177755411222">"制限付き割り込み"</item>
+    <item msgid="8735337502532332056">"割り込みなし"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"標準"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"キャッシュ済み（アクティビティクライアント）"</item>
     <item msgid="6652164677254579050">"キャッシュ済み（空）"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ティール"</item>
+    <item msgid="8332294763632946560">"ブルー"</item>
+    <item msgid="2023216417616991392">"インディゴ"</item>
+    <item msgid="3170497246594232819">"パープル"</item>
+    <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 0ae13f6..512a689 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>
@@ -139,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>
@@ -158,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>
@@ -329,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>
@@ -352,6 +340,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>
@@ -395,8 +407,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>
     <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>
@@ -407,7 +417,6 @@
     <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>
@@ -431,30 +440,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>
@@ -484,15 +493,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>
@@ -520,15 +522,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth詳細設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetoothをオンにすると、お使いの端末は近くにある他のBluetoothデバイスと通信できます。"</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>
@@ -541,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>
@@ -597,15 +577,11 @@
     <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>
@@ -628,6 +604,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"スキャン"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"詳細設定"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"アプリを表示"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi強度を表示"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ネットワークに接続"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ネットワークを保存"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ネットワークから切断"</string>
@@ -643,7 +621,7 @@
     <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>
@@ -669,20 +647,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>
@@ -755,6 +728,23 @@
     <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="3208568886184788972">"Wi-Fi通話モード"</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>
+    <item msgid="3132912693346866895">"Wi-Fiのみ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"OFF"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi優先（Wi-Fiが利用できない場合のみモバイルネットワークを使用します）"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"モバイル優先（モバイルネットワークが利用できない場合のみWi-Fiを使用します）"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -818,6 +808,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>
@@ -869,10 +864,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>
@@ -966,7 +961,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池残量"</string>
@@ -1011,10 +1007,16 @@
     <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="5805796658276223307">"ネットワークに関連するすべての設定を出荷時設定にリセットします。以下の設定が含まれます。\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="1745138973574945389">"すべてのネットワーク設定をリセットしますか？この操作は元に戻せません。"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"設定をリセット"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ネットワーク設定をリセットしてよいか確認するため、ロック解除パターンを入力する必要があります。"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"リセットしますか？"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ネットワーク設定をリセットしました"</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>
@@ -1109,6 +1111,8 @@
     <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_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>
@@ -1154,7 +1158,7 @@
     <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="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>
@@ -1400,17 +1404,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>
@@ -1449,19 +1442,29 @@
     <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>
@@ -1565,6 +1568,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>
@@ -1706,14 +1710,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>
@@ -1752,7 +1762,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>
@@ -1855,12 +1865,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>
@@ -2032,6 +2040,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>
@@ -2234,13 +2246,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_title" msgid="4315789475268695378">"通話をONにしますか？"</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を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>
@@ -2291,8 +2303,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>
@@ -2357,13 +2369,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>
@@ -2380,6 +2394,9 @@
     <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_all_apps" msgid="5377153522551809915">"アプリ ダウンロード アプリ システム"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"アプリ 権限 セキュリティ"</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>
@@ -2424,29 +2441,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d個のアプリが条件を指定しています</item>
+      <item quantity="one">%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>
@@ -2520,4 +2539,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"すべてのアプリの設定を既定にリセットします"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"インストール済みのアプリ: <xliff:g id="COUNT">%d</xliff:g>件（システムアプリやダウンロード済みアプリを含む）"</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>
 </resources>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index fd4b328..ce83c8f 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ყოველთვის"</item>
     <item msgid="844721238536786870">"მხოლოდ ქსელიდან კვების მიღების დროს"</item>
-    <item msgid="2990218920631468642">"ყოველთვის გაითიშოს (ზრდის მობილური ტრაფიკის მოცულობას)"</item>
+    <item msgid="1986753720941888596">"არასოდეს"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ყოველთვის"</item>
     <item msgid="7433294150916905997">"მხოლოდ მაშინ, როცა მიერთებულია"</item>
     <item msgid="1390404486722375028">"არასოდეს"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"ბოლო 30 დღე"</item>
+    <item msgid="6600989128423965319">"გამოყენების ციკლის დაყენება..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ავტომატურად"</item>
+    <item msgid="1013988753804838790">"ავტომატური"</item>
     <item msgid="6670588712989942178">"მხოლოდ 5 GHz"</item>
     <item msgid="2715516524973207876">"მხოლოდ 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"გამოყენების დრო"</item>
-    <item msgid="3703676222230317933">"მთვლელის ჩართვა"</item>
+    <item msgid="4796160515314745154">"ბოლოს გამოყენებული"</item>
     <item msgid="2502754479975776899">"აპის სახელი"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"მაღვიძარას ხმა"</item>
     <item msgid="785049718065337473">"შეტყობინების ხმა"</item>
     <item msgid="6700305533746877052">"Bluetooth-ის ხმა"</item>
-    <item msgid="3810969981743709839">"მიკროფონის დადუმება/გააქტიურება"</item>
-    <item msgid="2627903914574908209">"დარჩეს აქტიური"</item>
-    <item msgid="1395372654968157578">"მდებარეობის მონიტორინგი"</item>
-    <item msgid="3238451051299611853">"მაღალი ძაბვის მდებარეობის მონიტორინგი"</item>
+    <item msgid="2029227495214047094">"დარჩეს აქტიური"</item>
+    <item msgid="26109888160231211">"მდებარეობის მონიტორინგი"</item>
+    <item msgid="5753382310468855812">"მაღალი ძაბვის მდებარეობის მონიტორინგი"</item>
+    <item msgid="3356591542543137332">"გამოყენების სტატისტიკის მიღება"</item>
+    <item msgid="3073734345226842233">"მიკროფონის დადუმება/გააქტიურება"</item>
+    <item msgid="1148142988678569310">"მედიის პროეცირება"</item>
+    <item msgid="9130014005474445273">"VPN-ის აქტივაცია"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"მდებარეობა"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"მაღვიძარას ხმა"</item>
     <item msgid="9103719301075748925">"შეტყობინების ხმა"</item>
     <item msgid="7025966722295861512">"Bluetooth-ის ხმა"</item>
-    <item msgid="2265317984004577529">"მიკროფონის დადუმება/გააქტიურება"</item>
-    <item msgid="3646325683886507917">"დარჩეს აქტიური"</item>
+    <item msgid="4665183401128289653">"დარჩეს აქტიური"</item>
+    <item msgid="8584357129746649222">"მდებარეობა"</item>
     <item msgid="7669257279311110599">"მდებარეობა"</item>
-    <item msgid="7745724368696313169">"მდებარეობა"</item>
+    <item msgid="3459320345690097795">"გამოყენების სტატისტიკის მიღება"</item>
+    <item msgid="1312534577834048535">"მიკროფონის დადუმება/გააქტიურება"</item>
+    <item msgid="5906017727368097853">"მედიის პროეცირება"</item>
+    <item msgid="2486614710846178542">"VPN-ის აქტივაცია"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"მოკლე"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ნაგულისხმევი"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans-serif შესქელებული"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"თანაბარი შორისი"</item>
-    <item msgid="6857338041963571301">"თავისუფალი"</item>
-    <item msgid="961716102408512888">"კურსივი"</item>
-    <item msgid="784581717183349567">"პატარა მთავრულები"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"თავისუფალი"</item>
+    <item msgid="7967169925231332424">"კურსივი"</item>
+    <item msgid="561832997193039673">"პატარა მთავრულები"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"ძალიან პატარა"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K / ჟურნ. ბუფერზე"</item>
     <item msgid="2822309747675758628">"256K/ჟურნ. ბუფერზე"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"ქეშირებულია (აქტივობის კლიენტი)"</item>
     <item msgid="6652164677254579050">"ქეშირებული (ცარიელი)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ზურმუხტისფერი"</item>
+    <item msgid="8332294763632946560">"ლურჯი"</item>
+    <item msgid="2023216417616991392">"მუქი ლურჯი"</item>
+    <item msgid="3170497246594232819">"მეწამული"</item>
+    <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 80d0ea6..feb16ed 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>
@@ -137,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>
@@ -156,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>
@@ -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">"კარგი"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth, დამატებითი"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"როდესაც Bluetooth ჩართულია, თქვენს მოწყობილობას ახლომდებარე Bluetooth მოწყობილობებთან კომუნიკაცია შეუძლია."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ძიება"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"დამატებითი"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"აპების ჩვენება"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi სიმძ. ჩვენება"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ქსელთან დაკავშირება"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ქსელის დახსომება"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"დაივიწყე ქსელი"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-თი დარეკვის რეჟიმი"</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>
+    <item msgid="3132912693346866895">"მხოლოდ Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"გამორთული"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"სასურველია Wi-Fi (იყენებს ფიჭურ ქსელს მხოლოდ, როცა Wi-Fi მიუწვდომელია)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"სასურველია ფიჭური ინტერნეტი (იყენებს Wi-Fi-ს მხოლოდ, როცა ფიჭური ქსელი მიუწვდომელია)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"მხოლოდ 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ბატარეის სტატუსი"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ბატარეის დატენვის დონე"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"ეს ქსელთან დაკავშირებულ ყველა პარამეტრს ქარხნულ ნაგულისხმევ პარამეტრებზე ჩამოყრის, მათ შორის:\n\n"<li>"Wifi-ს"</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="1745138973574945389">"ჩამოვყაროთ ქსელის ყველა პარამეტრი? ამ მოქმედების უკუქცევა შეუძლებელია!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"პარამეტრების ჩამოყრა"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ქსელის პარამეტრების ჩამოყრის დასადასტურებლად, უნდა დახატოთ თქვენი განბლოკვის ნიმუში."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ჩამოვყაროთ პარამეტრები?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ქსელის პარამეტრების ჩამოყრა"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"აპები ჩამოტვირთვა აპლიკაციები სისტემა"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d აპი გაწვდით პირობებს</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"ყველა აპის პარამეტრების ნაგულისხმევზე გადაყენება"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"დაყენებულია <xliff:g id="COUNT">%d</xliff:g> აპი, სისტემური და ჩამოტვირთული აპების ჩათვლით"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"გაფართოებული"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"უცნობი აპი"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"პროფილის არჩევა"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-kk-rKZ-nokeys/strings.xml b/res/values-kk-rKZ-nokeys/strings.xml
new file mode 100644
index 0000000..8066313
--- /dev/null
+++ b/res/values-kk-rKZ-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Қолданбаларды басқару"</string>
+</resources>
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk-rKZ/arrays.xml
index eb5f79c..bf8eef0 100644
--- a/res/values-kk-rKZ/arrays.xml
+++ b/res/values-kk-rKZ/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Әрқашан"</item>
     <item msgid="844721238536786870">"Жалғанып тұрғанда"</item>
-    <item msgid="2990218920631468642">"Ешқашан (дерек қолдануды арттырады)"</item>
+    <item msgid="1986753720941888596">"Ешқашан"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Үнемі"</item>
     <item msgid="7433294150916905997">"Жалғанып тұрғанда ғана"</item>
     <item msgid="1390404486722375028">"Ешқашан"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Соңғы 30 күн"</item>
+    <item msgid="6600989128423965319">"Пайдалану циклын орнату…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Авто"</item>
+    <item msgid="1013988753804838790">"Aвтоматты"</item>
     <item msgid="6670588712989942178">"5 Ггц қана"</item>
     <item msgid="2715516524973207876">"2,4 Ггц қана"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Қолдану уақыты"</item>
-    <item msgid="3703676222230317933">"Санауды бастау"</item>
+    <item msgid="4796160515314745154">"Соңғы пайдаланылған уақыты"</item>
     <item msgid="2502754479975776899">"Қолданба атауы"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"дабыл дыбысының қаттылығы"</item>
     <item msgid="785049718065337473">"хабар дыбысының қаттылығы"</item>
     <item msgid="6700305533746877052">"bluetooth дыбысының қаттылығы"</item>
-    <item msgid="3810969981743709839">"микрофон дыбысын өшіру/қосу"</item>
-    <item msgid="2627903914574908209">"ояу ұстау"</item>
-    <item msgid="1395372654968157578">"орынды бақылау"</item>
-    <item msgid="3238451051299611853">"қуаты жоғары орынды бақылау"</item>
+    <item msgid="2029227495214047094">"ұйқы бермеу"</item>
+    <item msgid="26109888160231211">"аймақты бақылау"</item>
+    <item msgid="5753382310468855812">"қуаты жоғары аймақты бақылау"</item>
+    <item msgid="3356591542543137332">"пайдалану статистикасын алу"</item>
+    <item msgid="3073734345226842233">"микрофон дыбысын өшіру/қосу"</item>
+    <item msgid="1148142988678569310">"жоба тасушысы"</item>
+    <item msgid="9130014005474445273">"VPN функциясын белсендіру"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Аймақ"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Дабыл дыбысының қаттылығы"</item>
     <item msgid="9103719301075748925">"Хабар дыбысының қаттылығы"</item>
     <item msgid="7025966722295861512">"Bluetooth дыбысының қаттылығы"</item>
-    <item msgid="2265317984004577529">"Микрофон дыбысын өшіру/қосу"</item>
-    <item msgid="3646325683886507917">"Ояу ұстау"</item>
+    <item msgid="4665183401128289653">"Ұйқы бермеу"</item>
+    <item msgid="8584357129746649222">"Аймақ"</item>
     <item msgid="7669257279311110599">"Аймақ"</item>
-    <item msgid="7745724368696313169">"Орын"</item>
+    <item msgid="3459320345690097795">"Пайдалану статистикасын алу"</item>
+    <item msgid="1312534577834048535">"Микрофон дыбысын өшіру/қосу"</item>
+    <item msgid="5906017727368097853">"Жоба тасушысы"</item>
+    <item msgid="2486614710846178542">"VPN функциясын белсендіру"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Қысқа"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Бастапқы"</item>
     <item msgid="1016452621833735880">"Готикалық шрифт"</item>
     <item msgid="2496277987934654454">"Нығыз орналасқан готикалық шрифт"</item>
-    <item msgid="4406003087391086325">"Кертілген"</item>
-    <item msgid="1558362802170124073">"Бір енді"</item>
-    <item msgid="6857338041963571301">"Қалыпты"</item>
-    <item msgid="961716102408512888">"Курсив"</item>
-    <item msgid="784581717183349567">"Кішкене бас әріптер"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Қалыпты"</item>
+    <item msgid="7967169925231332424">"Көлбеу"</item>
+    <item msgid="561832997193039673">"Кішкене бас әріптер"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Өте кішкене"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 МБ"</item>
     <item msgid="3025431211013424097">"16 МБ"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 КБ"</item>
+    <item msgid="3534782711045262344">"256 КБ"</item>
+    <item msgid="8085867209202153403">"1 МБ"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"Әр журнал буферіне 64 КБ"</item>
     <item msgid="2822309747675758628">"Әр журнал буферіне 256 КБ"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кэштелген (белсенділік клиенті)"</item>
     <item msgid="6652164677254579050">"Кэштелген (бос)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Көгілдір"</item>
+    <item msgid="8332294763632946560">"Көк"</item>
+    <item msgid="2023216417616991392">"Индиго түсі"</item>
+    <item msgid="3170497246594232819">"Қызылкүрең"</item>
+    <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 208a262..265a0d1 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>
@@ -137,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>
@@ -156,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>
@@ -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">"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>
@@ -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">"Жарайды"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Жетілдірілген Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth қос. б., құр. басқа маң. Bluetooth құр-мен байл. алады."</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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Тікелей"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скандеу"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Қосымша"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Қолданбалар. көрсету"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi күшін көрсету"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Желіге жалғау"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Желіні есте сақтау"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Желіні ұмыту"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi қоңырау шалу режимі"</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>
+    <item msgid="3132912693346866895">"Тек Wi-Fi желісі"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Өшірулу"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi ұсынылған (Wi-Fi қол жетімсіз болса, ұялы байланысты пайдаланады)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Ұялы байланыс ұсынылған (ұялы байланыс қол жетімсіз болғанда ғана Wi-Fi пайдаланады)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Тек 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Батарея күйі"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Батарея деңгейі"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Бұл желі жасауға байланысты төмендегілерді қоса барлық параметрлерді зауыттық мәндерге қалпына келтіреді:\n\n"<li>"Wifi"</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="1745138973574945389">"Барлық желі параметрлерін қалпына келтіресіз бе? Бұл әрекетті кері қайтару мүмкін емес!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Параметрлерді қалпына келтіру"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Желі параметрлерін қалпына келтіру үшін құлыптан босату үлгісін салуыңыз керек."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Қалпына келтіру қажет пе?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Желі параметрлерін қалпына келтіру"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"қолданбаларды жүктеу қолданбалар жүйесі"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d қолданба шарттарды қамтамасыз етеді</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Параметрлерді барлық қолданбалар арқылы әдепкі мәндерге орнату"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> қолданбаларымен қоса, жүйе мен жүктелген қолданбалар орнатылды"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Кеңейтілген"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Белгісіз қолданба"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профильді таңдау"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index cb7f8c8..4a099c7 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -66,7 +66,7 @@
     <item msgid="7786168277516233536">"ធំ​សម្បើម"</item>
   </string-array>
   <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"យឺត​ណាស់"</item>
+    <item msgid="6041212618892492920">"យឺត​បំផុត"</item>
     <item msgid="2361722960903353554">"យឺត"</item>
     <item msgid="1145554631248513562">"ធម្មតា"</item>
     <item msgid="7553665153391107454">"លឿន"</item>
@@ -77,7 +77,7 @@
     <item msgid="6800277205640837264">"លឿន​បំផុត"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
-    <item msgid="7526050907652687351">"ទាប​ណាស់"</item>
+    <item msgid="7526050907652687351">"ទាប​បំផុត"</item>
     <item msgid="2692137425242433765">"ទាប"</item>
     <item msgid="3332408460740717754">"ធម្មតា"</item>
     <item msgid="4907380534957572531">"ខ្ពស់"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ជា​និច្ច"</item>
     <item msgid="844721238536786870">"តែ​ពេល​ដោតប៉ុណ្ណោះ"</item>
-    <item msgid="2990218920631468642">"កុំ (បង្កើន​ការ​ប្រើទិន្នន័យ)"</item>
+    <item msgid="1986753720941888596">"កុំ"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ជា​និច្ច"</item>
     <item msgid="7433294150916905997">"តែ​ពេល​ដោត"</item>
     <item msgid="1390404486722375028">"កុំ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 ថ្ងៃ​មុន"</item>
+    <item msgid="6600989128423965319">"កំណត់រង្វង់ប្រើប្រាស់..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ស្វ័យប្រវត្តិ"</item>
+    <item msgid="1013988753804838790">"ស្វ័យប្រវត្តិ"</item>
     <item msgid="6670588712989942178">"តែ ៥ ជីកាហឺត"</item>
     <item msgid="2715516524973207876">"តែ 2.4 GHz ប៉ុណ្ណោះ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ពេលវេលា​ប្រើ"</item>
-    <item msgid="3703676222230317933">"ចំនួន​ចាប់ផ្ដើម"</item>
+    <item msgid="4796160515314745154">"បាន​ប្រើ​​​ចុងក្រោយ"</item>
     <item msgid="2502754479975776899">"ឈ្មោះ​កម្មវិធី"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -195,7 +198,7 @@
   </string-array>
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"គ្មាន"</item>
-    <item msgid="8673874894887358090">"ដោយ​ដៃ"</item>
+    <item msgid="8673874894887358090">"ដោយ​បញ្ចូល"</item>
     <item msgid="168893341855953140">"រចនាសម្ព័ន្ធប្រូកស៊ីស្វ័យប្រវត្តិ"</item>
   </string-array>
   <string-array name="apn_auth_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="785049718065337473">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="6700305533746877052">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
-    <item msgid="3810969981743709839">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
-    <item msgid="2627903914574908209">"មិន​ដេក"</item>
-    <item msgid="1395372654968157578">"ពិនិត្យ​​ទីតាំង"</item>
-    <item msgid="3238451051299611853">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
+    <item msgid="2029227495214047094">"មិន​ដេក"</item>
+    <item msgid="26109888160231211">"តាមដាន​ទីតាំង"</item>
+    <item msgid="5753382310468855812">"​ពិនិត្យ​ទីតាំង​ថាមពល​​ខ្ពស់"</item>
+    <item msgid="3356591542543137332">"ទទួល​​ស្ថិតិ​​ប្រើប្រាស់"</item>
+    <item msgid="3073734345226842233">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
+    <item msgid="1148142988678569310">"មេឌៀ​គម្រោង"</item>
+    <item msgid="9130014005474445273">"ធ្វើឲ្យ VPN សកម្ម"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ទី​តាំង​"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"កម្រិត​សំឡេង​រោទ៍"</item>
     <item msgid="9103719301075748925">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</item>
     <item msgid="7025966722295861512">"កម្រិត​សំឡេង​ប៊្លូធូស"</item>
-    <item msgid="2265317984004577529">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
-    <item msgid="3646325683886507917">"មិន​ដេក"</item>
+    <item msgid="4665183401128289653">"មិន​ដេក"</item>
+    <item msgid="8584357129746649222">"ទី​តាំង​"</item>
     <item msgid="7669257279311110599">"ទី​តាំង​"</item>
-    <item msgid="7745724368696313169">"ទីតាំង"</item>
+    <item msgid="3459320345690097795">"ទទួល​​ស្ថិតិ​​ប្រើប្រាស់"</item>
+    <item msgid="1312534577834048535">"បិទ/បើក​សំឡេង​មីក្រូហ្វូន"</item>
+    <item msgid="5906017727368097853">"មេឌៀ​គម្រោង"</item>
+    <item msgid="2486614710846178542">"ធ្វើឲ្យ VPN សកម្ម"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ខ្លី"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"លំនាំដើម"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"ធម្មតា"</item>
-    <item msgid="961716102408512888">"សរសេរ​ជាប់គ្នា"</item>
-    <item msgid="784581717183349567">"អក្សរ​ធំ"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"ធម្មតា"</item>
+    <item msgid="7967169925231332424">"សរសេរ​ជាប់​គ្នា"</item>
+    <item msgid="561832997193039673">"អក្សរ​ពុម្ព​ធំ​ល្អិត"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"តូច​ណាស់"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K per log buffer"</item>
     <item msgid="2822309747675758628">"256K per log buffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ម៉ាស៊ីន​​កូន​សកម្មភាព​)"</item>
     <item msgid="6652164677254579050">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ទទេ​)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"បៃតង​​ចាស់"</item>
+    <item msgid="8332294763632946560">"ពណ៌ខៀវ"</item>
+    <item msgid="2023216417616991392">"ពណ៌​ឆ្លុះ"</item>
+    <item msgid="3170497246594232819">"ស្វាយ"</item>
+    <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 8ca2e70..79a3132 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>
@@ -137,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>
@@ -156,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>
@@ -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">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ប៊្លូធូស​កម្រិត​ខ្ពស់"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"នៅពេលបានបើកប៊្លូធូសឧបករណ៍របស់អ្នកអាចទាក់ទងជាមួយឧបករណ៍ប៊្លូធូសនៅក្បែរ​ផ្សេងៗទៀតបាន។"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"វ៉ាយហ្វាយផ្ទាល់"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"វិភាគ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"កម្រិត​ខ្ពស់"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"បង្ហាញ​កម្មវិធី"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"បង្ហាញកម្រិត​វ៉ាយហ្វាយ"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"តភ្ជាប់បណ្ដាញ"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ចងចាំ​បណ្ដាញ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"បំភ្លេច​បណ្ដាញ"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"របៀបហៅតាម Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi-Fi តែប៉ុណ្ណោះ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"បិទ"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"គួរប្រើ Wi-Fi (ប្រើតែបណ្តាញទូរស័ព្ទប៉ុណ្ណោះ ប្រសិនមិនមាន Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"គួរប្រើបណ្តាញទូរស័ព្ទ (ប្រើតែ Wi-Fi ប៉ុណ្ណោះ ប្រសិនបើមិនមានបណ្តាញទូរស័ព្ទ)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ស្ថានភាព​ថ្ម"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"កម្រិត​ថ្ម"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"វានឹងកំណត់ការកំណត់ទាំងអស់ដែលទាក់ទងនឹងបណ្តាញឡើងវិញទៅលំនាំដើមទាំងស្រុង \n\n"<li>"Wifi"</li>\n<li>"ទិន្នន័យទូរស័ព្ទ"</li>\n<li>"ប៊្លូធូស"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"កំណត់ការកំណត់ឡើងវិញ"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ? អ្នកមិនអាចផ្លាស់ប្តូរសកម្មភាពនេះវិញបានទេ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"កំណត់ការកំណត់ឡើងវិញ"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"អ្នកត្រូវគូសលំនាំដោះសោរបស់អ្នកដើម្បីបញ្ជាក់ពីការកំណត់បណ្តាញឡើងវិញ។"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"កំណត់ឡើងវិញ?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"ប្រើ GPS ដើម្បីកំណត់ទីតាំងរបស់អ្នក"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ការស្កេន"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ការស្កេន"</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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"កម្មវិធីទាញយកប្រព័ន្ធកម្មវិធី"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <string name="keywords_lockscreen" msgid="4806191868723291541">"រុញ​ពាក្យសម្ងាត់ លំនាំ កូដ pin"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំ​ស្លាក​អិនអេហ្វ​ស៊ី​វ៉ាយហ្វាយ"</string>
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">កម្មវិធី %d ត្រូវបានផ្តល់លក្ខខណ្ឌ</item>
+      <item quantity="one">កម្មវិធី %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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"កំណត់ចំណូលចិត្តនៅលើកម្មវិធីទាំងអស់ឡើងវិញទៅលំនាំដើម"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"បានដំឡើងកម្មវិធី <xliff:g id="COUNT">%d</xliff:g> រួមបញ្ចូលទាំងកម្មវិធីប្រព័ន្ធ និងកម្មវិធីដែលបានទាញយក"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"ជ្រើសប្រវត្តិរូប"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-kn-rIN-nokeys/strings.xml b/res/values-kn-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..c1223a8
--- /dev/null
+++ b/res/values-kn-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ವಹಿಸಿ"</string>
+</resources>
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn-rIN/arrays.xml
index bcb1b3d..e3be7d3 100644
--- a/res/values-kn-rIN/arrays.xml
+++ b/res/values-kn-rIN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -129,8 +128,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"ಒತ್ತುವ ಬಟನ್"</item>
-    <item msgid="1624323946324499595">"ಪೀರ್ ಸಾಧನದಿಂದ PIN"</item>
-    <item msgid="5366790421523328066">"ಈ ಸಾಧನದಿಂದ PIN"</item>
+    <item msgid="1624323946324499595">"ಪೀರ್ ಸಾಧನದಿಂದ ಪಿನ್‌"</item>
+    <item msgid="5366790421523328066">"ಈ ಸಾಧನದಿಂದ ಪಿನ್‌"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ಯಾವಾಗಲೂ"</item>
     <item msgid="844721238536786870">"ಕೇವಲ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿದಾಗ"</item>
-    <item msgid="2990218920631468642">"ಎಂದಿಗೂ ಇಲ್ಲ (ಡೇಟಾ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ)"</item>
+    <item msgid="1986753720941888596">"ಎಂದಿಗೂ ಬೇಡ"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ಯಾವಾಗಲೂ"</item>
     <item msgid="7433294150916905997">"ಕೇವಲ ಪ್ಲಗ್ ಇನ್ ಮಾಡಿದಾಗ"</item>
     <item msgid="1390404486722375028">"ಎಂದಿಗೂ ಇಲ್ಲ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"ಕಳೆದ 30 ದಿನಗಳು"</item>
+    <item msgid="6600989128423965319">"ಬಳಕೆಯ ಆವರ್ತನೆಯನ್ನು ಹೊಂದಿಸಿ..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ಸ್ವಯಂಚಾಲಿತ"</item>
+    <item msgid="1013988753804838790">"ಸ್ವಯಂಚಾಲಿತ"</item>
     <item msgid="6670588712989942178">"5 GHz ಮಾತ್ರ"</item>
     <item msgid="2715516524973207876">"2.4 GHz ಮಾತ್ರ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ಬಳಕೆ ಸಮಯ"</item>
-    <item msgid="3703676222230317933">"ಎಣಿಕೆ ಪ್ರಾರಂಭಿಸು"</item>
+    <item msgid="4796160515314745154">"ಕಳೆದ ಬಾರಿಯ ಬಳಕೆ"</item>
     <item msgid="2502754479975776899">"ಅಪ್ಲಿಕೇಶನ್ ಹೆಸರು"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"ಎಚ್ಚರಿಕೆ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="785049718065337473">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="6700305533746877052">"bluetooth ವಾಲ್ಯೂಮ್"</item>
-    <item msgid="3810969981743709839">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
-    <item msgid="2627903914574908209">"ಎಚ್ಚರವಹಿಸಿ"</item>
-    <item msgid="1395372654968157578">"ಪರಿವೀಕ್ಷಣೆ ಸ್ಥಾನ"</item>
-    <item msgid="3238451051299611853">"ಪರಿವೀಕ್ಷಣೆಯ ಹೆಚ್ಚಿನ ಸಾಮರ್ಥ್ಯದ ಸ್ಥಾನ"</item>
+    <item msgid="2029227495214047094">"ಎಚ್ಚರವಹಿಸಿ"</item>
+    <item msgid="26109888160231211">"ಪರಿವೀಕ್ಷಣೆ ಸ್ಥಾನ"</item>
+    <item msgid="5753382310468855812">"ಪರಿವೀಕ್ಷಣೆಯ ಹೆಚ್ಚಿನ ಸಾಮರ್ಥ್ಯದ ಸ್ಥಾನ"</item>
+    <item msgid="3356591542543137332">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆಯಿರಿ"</item>
+    <item msgid="3073734345226842233">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
+    <item msgid="1148142988678569310">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
+    <item msgid="9130014005474445273">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ಸ್ಥಾನ"</item>
@@ -318,11 +324,14 @@
     <item msgid="7878027809189330917">"ಮಾಧ್ಯಮ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="7260546305036218513">"ಎಚ್ಚರಿಕೆ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="9103719301075748925">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
-    <item msgid="7025966722295861512">"Bluetooth ವಾಲ್ಯೂಮ್"</item>
-    <item msgid="2265317984004577529">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
-    <item msgid="3646325683886507917">"ಎಚ್ಚರವಹಿಸಿ"</item>
+    <item msgid="7025966722295861512">"ಬ್ಲೂಟೂತ್‌‌ ವಾಲ್ಯೂಮ್"</item>
+    <item msgid="4665183401128289653">"ಎಚ್ಚರದಿಂದಿರಿಸಿ"</item>
+    <item msgid="8584357129746649222">"ಸ್ಥಾನ"</item>
     <item msgid="7669257279311110599">"ಸ್ಥಾನ"</item>
-    <item msgid="7745724368696313169">"ಸ್ಥಳ"</item>
+    <item msgid="3459320345690097795">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"</item>
+    <item msgid="1312534577834048535">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
+    <item msgid="5906017727368097853">"ಪ್ರಾಜೆಕ್ಟ್ ಮೀಡಿಯಾ"</item>
+    <item msgid="2486614710846178542">"VPN ಸಕ್ರಿಯಗೊಳಿಸಿ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ಚಿಕ್ಕದು"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ಡೀಫಾಲ್ಟ್"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"ಮಾನೋಸ್ಪೇಸ್"</item>
-    <item msgid="6857338041963571301">"ಪ್ರಾಸಂಗಿಕ"</item>
-    <item msgid="961716102408512888">"ಹಸ್ತಾಕ್ಷರಲಿಪಿ"</item>
-    <item msgid="784581717183349567">"ಸ್ಮಾಲ್‌ ಕ್ಯಾಪಿಟಲ್ಸ್‌‌"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"ಪ್ರಾಸಂಗಿಕ"</item>
+    <item msgid="7967169925231332424">"ಹಸ್ತಾಕ್ಷರಲಿಪಿ"</item>
+    <item msgid="561832997193039673">"ಸ್ಮಾಲ್‌ ಕ್ಯಾಪಿಟಲ್ಸ್‌‌"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"ತುಂಬಾ ಸಣ್ಣ"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"ಪ್ರತಿ ಲಾಗ್ ಬಫರ್‌ಗೆ 64K"</item>
     <item msgid="2822309747675758628">"ಪ್ರತಿ ಲಾಗ್ ಬಫರ್‌ಗೆ 256K"</item>
@@ -487,8 +502,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"ಆಫ್ ಆಗಿದೆ"</item>
-    <item msgid="5656544177755411222">"ಸೀಮಿತವಾದ ಅಡೆತಡೆಗಳು"</item>
-    <item msgid="8735337502532332056">"ಶೂನ್ಯ ಅಡೆತಡೆಗಳು"</item>
+    <item msgid="5656544177755411222">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳನ್ನು ಆಗಾಗ ತಡೆಹಾಕು"</item>
+    <item msgid="8735337502532332056">"ಕರೆ ಹಾಗೂ ಸಂದೇಶಗಳಿಗೆ ತಡೆಹಾಕದಿರು"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"ಸಾಮಾನ್ಯ"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"ಕ್ಯಾಶ್ ಮಾಡಲಾದ (ಚಟುವಟಿಕೆ ಕ್ಲೈಂಟ್)"</item>
     <item msgid="6652164677254579050">"ಕ್ಯಾಶ್ ಮಾಡಲಾಗಿದೆ (ಖಾಲಿ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ಗಾಢ ಹಸಿರು-ನೀಲಿ"</item>
+    <item msgid="8332294763632946560">"ನೀಲಿ"</item>
+    <item msgid="2023216417616991392">"ಊದಾ"</item>
+    <item msgid="3170497246594232819">"ನೇರಳೆ"</item>
+    <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 81a6a94..2558921 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>
@@ -137,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>
@@ -156,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>
@@ -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="TRUST_AGENT_NAME">%2$s</xliff:g> ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡಿದ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ, ಸ್ಲೀಪ್ ಮೋಡ್‌ಗೆ ಬದಲಾದ <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> ನಂತರ"</string>
@@ -350,6 +338,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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ಸುಧಾರಿತ ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ಬ್ಲೂಟೂತ್‌‌ ಆನ್‌ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಸಾಧನವು ಇತರ ಸಮೀಪದ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳ ಜೊತೆಗೆ ಸಂವಹನ ಮಾಡಬಹುದು."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ಡೈರೆಕ್ಟ್"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ಸ್ಕ್ಯಾನ್"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ಸುಧಾರಿತ"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"ಅಪ್ಲಿ. ತೋರಿಸು"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"ವೈಫೈ ಸಾಮರ್ಥ್ಯ ತೋರಿಸು"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ನೆಟ್‌ವರ್ಕ್ ನೆನಪಿಡಿ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ನೆಟ್‌ವರ್ಕ್‌ ಮರೆತುಬಿಡು"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಮೋಡ್"</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>
+    <item msgid="3132912693346866895">"ವೈ-ಫೈ ಮಾತ್ರ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ಆಫ್"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ವೈ-ಫೈಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ (ಒಂದು ವೇಳೆ ವೈ-ಫೈ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಮಾತ್ರ ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್ ಬಳಸುತ್ತದೆ)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ಸೆಲ್ಯುಲಾರ್‌ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ (ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಮಾತ್ರ ವೈ-ಫೈ ಬಳಸುತ್ತದೆ)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"ವೈ-ಫೈ ಮಾತ್ರ (ಸೆಲ್ ನೆಟ್‌ವರ್ಕ್ ಎಂದಿಗೂ ಬಳಸುವುದಿಲ್ಲ. ಒಂದು ವೇಳೆ ವೈ-ಫೈ ಲಭ್ಯವಿಲ್ಲದಿದ್ದರೆ ಕರೆಗಳನ್ನು ಮಾಡಲು ಅಥವಾ ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ)"</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 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ಬ್ಯಾಟರಿ ಸ್ಥಿತಿ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ಬ್ಯಾಟರಿ ಮಟ್ಟ"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"ಇದು ನೆಟ್‌ವರ್ಕಿಂಗ್‌ಗೆ ಸಂಬಂಧಿಸಿದ ಎಲ್ಲಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಫ್ಯಾಕ್ಟರಿ ಡೀಫಾಲ್ಟ್‌ಗೆ ಮರುಹೊಂದಿಸುತ್ತದೆ, ಉದಾಹರಣೆಗೆ:\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="1745138973574945389">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನೀವು ಈ ಕ್ರಮವನ್ನು ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ದೃಢೀಕರಿಸಲು ನಿಮ್ಮ ಅನ್‌ಲಾಕ್‌ ನಮೂನೆಯನ್ನು ನೀವು ಎಳೆಯುವ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಮರುಹೊಂದಾಣಿಕೆ"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಡೌನ್‌ಲೋಡ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಿಸ್ಟಮ್"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅನುಮತಿಗಳು ಭದ್ರತೆ"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಷರತ್ತುಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಾದ್ಯಂತ ಆದ್ಯತೆಗಳನ್ನು ಡೀಫಾಲ್ಟ್‌ಗಳಿಗೆ ಮರುಹೊಂದಿಸಿ"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"ಸಿಸ್ಟಮ್ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸೇರಿದಂತೆ, <xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</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>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 5a2f18a..9198cf2 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"항상"</item>
     <item msgid="844721238536786870">"충전 중인 경우에만"</item>
-    <item msgid="2990218920631468642">"안함(데이터 사용 증가)"</item>
+    <item msgid="1986753720941888596">"안함"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"항상"</item>
     <item msgid="7433294150916905997">"충전 중인 경우에만"</item>
     <item msgid="1390404486722375028">"안함"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"최근 30일"</item>
+    <item msgid="6600989128423965319">"사용 주기 설정..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"자동"</item>
+    <item msgid="1013988753804838790">"자동"</item>
     <item msgid="6670588712989942178">"5GHz 전용"</item>
     <item msgid="2715516524973207876">"2.4GHz 전용"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"사용 시간"</item>
-    <item msgid="3703676222230317933">"계수 시작"</item>
+    <item msgid="4796160515314745154">"최근 사용"</item>
     <item msgid="2502754479975776899">"앱 이름"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"알람 볼륨"</item>
     <item msgid="785049718065337473">"알림 볼륨"</item>
     <item msgid="6700305533746877052">"블루투스 볼륨"</item>
-    <item msgid="3810969981743709839">"마이크 음소거/음소거 해제"</item>
-    <item msgid="2627903914574908209">"켜진 상태로 유지"</item>
-    <item msgid="1395372654968157578">"위치 모니터링"</item>
-    <item msgid="3238451051299611853">"고전력 위치 모니터링"</item>
+    <item msgid="2029227495214047094">"켜진 상태로 유지"</item>
+    <item msgid="26109888160231211">"위치 모니터링"</item>
+    <item msgid="5753382310468855812">"고전력 위치 모니터링"</item>
+    <item msgid="3356591542543137332">"사용 통계 가져오기"</item>
+    <item msgid="3073734345226842233">"마이크 음소거/음소거 해제"</item>
+    <item msgid="1148142988678569310">"프로젝트 미디어"</item>
+    <item msgid="9130014005474445273">"VPN 활성화"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"위치"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"알람 볼륨"</item>
     <item msgid="9103719301075748925">"알림 볼륨"</item>
     <item msgid="7025966722295861512">"블루투스 볼륨"</item>
-    <item msgid="2265317984004577529">"마이크 음소거/음소거 해제"</item>
-    <item msgid="3646325683886507917">"켜진 상태로 유지"</item>
+    <item msgid="4665183401128289653">"켜진 상태로 유지"</item>
+    <item msgid="8584357129746649222">"위치"</item>
     <item msgid="7669257279311110599">"위치"</item>
-    <item msgid="7745724368696313169">"위치"</item>
+    <item msgid="3459320345690097795">"사용 통계 가져오기"</item>
+    <item msgid="1312534577834048535">"마이크 음소거/음소거 해제"</item>
+    <item msgid="5906017727368097853">"프로젝트 미디어"</item>
+    <item msgid="2486614710846178542">"VPN 활성화"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"기본값"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"좁은 Sans-serif"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"고정 너비"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Small capitals"</item>
+    <item msgid="7247838127505318669">"Sans Serif 고정 너비"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif 고정 너비"</item>
+    <item msgid="639503332147461010">"캐주얼"</item>
+    <item msgid="7967169925231332424">"필기체"</item>
+    <item msgid="561832997193039673">"작은 대문자"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"아주 작게"</item>
@@ -365,7 +375,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">
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"로그 버퍼당 64K"</item>
     <item msgid="2822309747675758628">"로그 버퍼당 256K"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"캐시됨(활동 클라이언트)"</item>
     <item msgid="6652164677254579050">"캐시됨(비어 있음)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"청록색"</item>
+    <item msgid="8332294763632946560">"파란색"</item>
+    <item msgid="2023216417616991392">"남색"</item>
+    <item msgid="3170497246594232819">"보라색"</item>
+    <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 11247f6..6bcb8a8 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>
@@ -137,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>
@@ -156,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>
@@ -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="TRUST_AGENT_NAME">%2$s</xliff:g>에 의해 잠금 해제된 경우를 제외하고 절전 모드 후 <xliff:g id="TIMEOUT_STRING">%1$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">"확인"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"고급 블루투스"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"기기에서 블루투스가 켜져 있으면 주변의 다른 블루투스 기기와 통신할 수 있습니다."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"검색"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"고급"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"앱 표시"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wi-Fi 강도 표시"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"네트워크 연결"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"네트워크 저장"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"네트워크 저장 안함"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -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">"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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi 통화 모드"</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>
+    <item msgid="3132912693346866895">"Wi-Fi에서만"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"사용 안함"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi를 기본으로 설정(Wi-Fi를 사용할 수 없는 경우에만 모바일 네트워크 사용)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"모바일 데이터를 기본으로 설정(모바일 네트워크를 사용할 수 없는 경우에만 Wi-Fi 사용)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"배터리 수준"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">\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="1745138973574945389">"모든 네트워크 설정을 초기화하시겠습니까? 수행한 후에는 되돌릴 수 없습니다."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"설정 초기화"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"네트워크 설정 초기화를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"초기화하시겠습니까?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"네트워크 설정 초기화"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"앱 다운로드 애플리케이션 시스템"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d개 앱에서 조건을 제공합니다.</item>
+      <item quantity="one">%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>
@@ -2481,7 +2501,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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"모든 앱의 환경설정을 기본값으로 초기화합니다."</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"시스템 앱과 다운로드한 앱을 포함하여 <xliff:g id="COUNT">%d</xliff:g>개의 앱이 설치되었습니다."</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"고급"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"알 수 없는 앱"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"프로필 선택"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky-rKG/arrays.xml
index ff98a8d..db83074 100644
--- a/res/values-ky-rKG/arrays.xml
+++ b/res/values-ky-rKG/arrays.xml
@@ -92,7 +92,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
     <!-- no translation found for wifi_eap_method:0 (1160193392455075561) -->
     <!-- no translation found for wifi_eap_method:1 (7981731051382306293) -->
     <!-- no translation found for wifi_eap_method:2 (2892994535305020162) -->
@@ -118,22 +117,21 @@
     <!-- no translation found for wifi_signal:1 (5615082285463430971) -->
     <!-- no translation found for wifi_signal:2 (3565079809875324621) -->
     <!-- no translation found for wifi_signal:3 (5702329417707689835) -->
-  <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"Дайыма"</item>
-    <item msgid="844721238536786870">"Дүрмөттөө учурунда гана"</item>
-    <item msgid="2990218920631468642">"Эч качан (трафик колдонуу көбөйөт)"</item>
-  </string-array>
+    <!-- no translation found for wifi_sleep_policy_entries:2 (1986753720941888596) -->
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Дайыма"</item>
     <item msgid="7433294150916905997">"Бир гана дүрмөттөө учурунда"</item>
     <item msgid="1390404486722375028">"Эч качан"</item>
   </string-array>
-    <!-- no translation found for wifi_frequency_band_entries:0 (624340809384223320) -->
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Акыркы 30 күн"</item>
+    <item msgid="6600989128423965319">"Колдонуу мерчимин коюу…"</item>
+  </string-array>
     <!-- no translation found for wifi_frequency_band_entries:1 (6670588712989942178) -->
     <!-- no translation found for wifi_frequency_band_entries:2 (2715516524973207876) -->
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Колдонулган убакыт"</item>
-    <item msgid="3703676222230317933">"Жүргүзүү эсеби"</item>
+    <item msgid="4796160515314745154">"Акыркы жолу колдонулган"</item>
     <item msgid="2502754479975776899">"Колдонмонун аты"</item>
   </string-array>
     <!-- no translation found for wifi_eap_entries:0 (8615575908717909498) -->
@@ -222,10 +220,13 @@
     <item msgid="5762123934816216821">"ойготкучтун үнү"</item>
     <item msgid="785049718065337473">"эскерткичтин үнү"</item>
     <item msgid="6700305533746877052">"bluetooth үнү"</item>
-    <item msgid="3810969981743709839">"микрофондун үнүн басуу/чыгаруу"</item>
-    <item msgid="2627903914574908209">"көшүтпөө"</item>
-    <item msgid="1395372654968157578">"жайгашкан жерге көз салуу"</item>
-    <item msgid="3238451051299611853">"жогору кубаттуу жерге көз салуу"</item>
+    <item msgid="2029227495214047094">"ойго кармоо"</item>
+    <item msgid="26109888160231211">"жайгашууну көзөмөлдөө"</item>
+    <item msgid="5753382310468855812">"жогору кубаттуу жайгашууну көзөмөлдөө"</item>
+    <item msgid="3356591542543137332">"колдонуу статистикасын алуу"</item>
+    <item msgid="3073734345226842233">"микрофондун үнүн басуу/чыгаруу"</item>
+    <item msgid="1148142988678569310">"долбоор медиясы"</item>
+    <item msgid="9130014005474445273">"VPN\'ди жандыруу"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Орду"</item>
@@ -268,10 +269,13 @@
     <item msgid="7260546305036218513">"Ойготкучтун үнү"</item>
     <item msgid="9103719301075748925">"Эскерткичтин үнү"</item>
     <item msgid="7025966722295861512">"Bluetooth үнү"</item>
-    <item msgid="2265317984004577529">"Микрофондун үнүн басуу/чыгаруу"</item>
-    <item msgid="3646325683886507917">"Көшүтпөө"</item>
+    <item msgid="4665183401128289653">"Ойго кармоо"</item>
+    <item msgid="8584357129746649222">"Орду"</item>
     <item msgid="7669257279311110599">"Орду"</item>
-    <item msgid="7745724368696313169">"Жайгашкан жер"</item>
+    <item msgid="3459320345690097795">"Колдонуу статистикасын алуу"</item>
+    <item msgid="1312534577834048535">"Микрофондун үнүн басуу/чыгаруу"</item>
+    <item msgid="5906017727368097853">"Долбоор медиясы"</item>
+    <item msgid="2486614710846178542">"VPN\'ди жандыруу"</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) -->
@@ -280,11 +284,12 @@
     <item msgid="1319652728542138112">"Абалкы"</item>
     <item msgid="1016452621833735880">"Санс-сериф"</item>
     <item msgid="2496277987934654454">"коюлтулган Санс-сериф"</item>
-    <item msgid="4406003087391086325">"Сериф"</item>
-    <item msgid="1558362802170124073">"Бир эндүү"</item>
-    <item msgid="6857338041963571301">"Бириндеген"</item>
-    <item msgid="961716102408512888">"Жантык"</item>
-    <item msgid="784581717183349567">"Кичине баш тамгалар"</item>
+    <item msgid="7247838127505318669">"Sans-serif бир орундуу"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif бир орундуу"</item>
+    <item msgid="639503332147461010">"Эркин"</item>
+    <item msgid="7967169925231332424">"Жантык"</item>
+    <item msgid="561832997193039673">"Кичине баш тамгалар"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Өтө кичине"</item>
@@ -322,6 +327,11 @@
     <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">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 K каттоо буфери үчүн"</item>
     <item msgid="2822309747675758628">"256 K каттоо буфери үчүн"</item>
@@ -431,7 +441,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>
@@ -444,4 +454,19 @@
     <item msgid="4338089220026248848">"Кештелген (иш-аракет кардары)"</item>
     <item msgid="6652164677254579050">"Кештелген (бош)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Жашыл көгүш"</item>
+    <item msgid="8332294763632946560">"Көк"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Кызгылт көгүш"</item>
+    <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 d02f107..81366a7 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>
@@ -213,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 />
@@ -241,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>
@@ -515,9 +501,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>
@@ -544,6 +527,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) -->
@@ -597,8 +604,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>
@@ -613,7 +618,6 @@
     <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>
@@ -647,30 +651,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) -->
@@ -713,17 +717,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 />
@@ -765,16 +760,6 @@
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth күйгүзүлгөндө түзмөгүңүз жакын арадагы башка Bluetooth түзмөктөрү менен байланыша алат."</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) -->
@@ -796,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) -->
@@ -833,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>
@@ -872,16 +834,12 @@
     <!-- 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>
@@ -908,6 +866,8 @@
     <skip />
     <!-- no translation found for wifi_menu_advanced (7522252991919573664) -->
     <skip />
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Колдонмолорду көрсөт"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi күчүн көрсөтүү"</string>
     <!-- no translation found for wifi_menu_connect (4996220309848349408) -->
     <skip />
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Тармакты эстеп калуу"</string>
@@ -926,7 +886,7 @@
     <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>
@@ -965,24 +925,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>
@@ -1072,6 +1026,23 @@
     <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="3208568886184788972">"Wi-Fi чалуу режими"</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>
+    <item msgid="3132912693346866895">"Wi-Fi гана"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Өчүк"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi тандалган (Эгер Wi-Fi болбосо, уюлдук тармакты гана колдонот)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Уюлдук тармак тандалган (Эгер уюлдук тармак жеткиликтүү эмес болсо, Wi-Fi гана пайдаланат)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi гана (Эч качан уюлдук тармак колдонбойт. Эгер Wi-Fi болбосо, чалуу жасап же кабыл ала албайт)"</string>
     <string name="home_settings" msgid="212375129455718176">"Үйгө"</string>
     <!-- no translation found for display_settings_title (1708697328627382561) -->
     <skip />
@@ -1167,6 +1138,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>
@@ -1239,10 +1215,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 />
@@ -1393,7 +1369,8 @@
     <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>
     <!-- no translation found for battery_status_title (9159414319574976203) -->
     <skip />
@@ -1468,13 +1445,17 @@
     <!-- 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="5805796658276223307">"Бул тармакка байланыштуу жөндөөлөрдүн баарын заводдук демейки абалына келтирет, анын ичинде:\n\n"<li>"Wifi"</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="1745138973574945389">"Тармак жөндөөлөрүнүн баары баштапкы абалга келтирилсинби? Бул аракетти артка кайтара албайсыз!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Жөндөөлөрдү баштапкы абалга келтирүү"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Тармак жөндөөлөрүн баштапкы абалга келтирүүнү ырасташ үчүн, үлгү ачкычты тартышыңыз керек."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Баштапкы абалга келтирилсинби?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Тармак жөндөөлөрү баштапкы абалга келтирилди"</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) -->
@@ -1608,6 +1589,8 @@
     <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_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>
@@ -1682,7 +1665,7 @@
     <skip />
     <!-- no translation found for lockpassword_pattern_set_toast (6867259621331406236) -->
     <skip />
-    <string name="lock_settings_title" msgid="335025124489630932">"Коопсуздук көшөгөсү"</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) -->
@@ -2040,25 +2023,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) -->
@@ -2115,14 +2079,6 @@
     <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) -->
@@ -2130,6 +2086,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>
@@ -2246,6 +2222,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>
@@ -2436,14 +2413,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>
@@ -2489,8 +2472,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) -->
@@ -2639,14 +2621,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>
@@ -2878,6 +2857,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 />
@@ -3130,13 +3113,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>
@@ -3187,8 +3170,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>
@@ -3253,13 +3236,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>
@@ -3276,6 +3261,10 @@
     <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_all_apps" msgid="5377153522551809915">"колдонмолор колдонмо тутумун жүктөп алат"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -3322,29 +3311,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d колдонмо шарттар менен камсыз кылат</item>
+      <item quantity="one">%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>
@@ -3418,4 +3409,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Бардык колдонмолордогу жеке жөндөөлөрдү демейки абалга келтирүү"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> колдонмо орнотулду, анын ичинде тутумдук жана жүктөлүп алынган колдонмолор бар"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Өркүндөтүлгөн"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Белгисиз колдонмо"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Профиль тандоо"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index aa32f33..d950a79 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ຕະຫຼອດເວລາ"</item>
     <item msgid="844721238536786870">"ສະເພາະເມື່ອສຽບສາຍສາກ"</item>
-    <item msgid="2990218920631468642">"ບໍ່ໃຊ້ (ເພີ່ມປະລິມານການນຳໃຊ້ຂໍ້ມູນ)"</item>
+    <item msgid="1986753720941888596">"ບໍ່ໃຊ້"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ຕະຫຼອດເວລາ"</item>
     <item msgid="7433294150916905997">"ສະເພາະເມື່ອສຽບສາຍສາກເທົ່ານັ້ນ"</item>
     <item msgid="1390404486722375028">"ບໍ່ໃຊ້"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 ມື້ທີ່ຜ່ານມາ"</item>
+    <item msgid="6600989128423965319">"ຕັ້ງ​ຮອບ​ການ​ນຳ​ໃຊ້..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ອັດຕະໂນມັດ"</item>
+    <item msgid="1013988753804838790">"ອັດຕະໂນມັດ"</item>
     <item msgid="6670588712989942178">"5 GHz ເທົ່ານັ້ນ"</item>
     <item msgid="2715516524973207876">"2.4 GHz ເທົ່ານັ້ນ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ໄລຍະເວລາການນຳໃຊ້"</item>
-    <item msgid="3703676222230317933">"ຈຳນວນການເລີ່ມນຳໃຊ້"</item>
+    <item msgid="4796160515314745154">"ໃຊ້​ເທື່ອ​ສຸດ​ທ້າຍ"</item>
     <item msgid="2502754479975776899">"ຊື່ແອັບຯ"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"ລະດັບສຽງໂມງປຸກ"</item>
     <item msgid="785049718065337473">"ລະດັບສຽງແຈ້ງເຕືອນ"</item>
     <item msgid="6700305533746877052">"ລະດັບສຽງ Bluetooth"</item>
-    <item msgid="3810969981743709839">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
-    <item msgid="2627903914574908209">"​ເຮັດ​ວຽກ​ຕະຫຼອດ​ເວ​ລາ"</item>
-    <item msgid="1395372654968157578">"ຕຳແໜ່ງ​ຕິດ​ຕາມ"</item>
-    <item msgid="3238451051299611853">"​ຕິດ​ຕາມ​ສະ​ຖານ​ທີ່​ທີ່​ມີ​ພະ​ລັງ​ງານ​ສູງ"</item>
+    <item msgid="2029227495214047094">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
+    <item msgid="26109888160231211">"ຕຳແໜ່ງ​ຕິດ​ຕາມ"</item>
+    <item msgid="5753382310468855812">"ຕິດຕາມສະຖານທີ່ທີ່ມີພະລັງງານສູງ"</item>
+    <item msgid="3356591542543137332">"ໂຫຼດ​ສະ​ຖິ​ຕິ​ການ​ນຳ​ໃຊ້"</item>
+    <item msgid="3073734345226842233">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
+    <item msgid="1148142988678569310">"​ໂປ​ຣ​ເຈັກ​ມີ​ເດຍ"</item>
+    <item msgid="9130014005474445273">"​​ເປີດ​ນຳ​ໃຊ້ VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ຕຳແໜ່ງ"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"ລະດັບສຽງໂມງປຸກ"</item>
     <item msgid="9103719301075748925">"ລະດັບສຽງແຈ້ງເຕືອນ"</item>
     <item msgid="7025966722295861512">"ລະດັບສຽງ Bluetooth"</item>
-    <item msgid="2265317984004577529">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
-    <item msgid="3646325683886507917">"​ເຮັດ​ວຽກ​ຕະຫຼອດ​ເວ​ລາ"</item>
+    <item msgid="4665183401128289653">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
+    <item msgid="8584357129746649222">"ສະຖານທີ່"</item>
     <item msgid="7669257279311110599">"ສະຖານທີ່"</item>
-    <item msgid="7745724368696313169">"ສະຖານທີ່"</item>
+    <item msgid="3459320345690097795">"ໂຫຼດ​ສະ​ຖິ​ຕິ​ການ​ນຳ​ໃຊ້"</item>
+    <item msgid="1312534577834048535">"ປິດ/ເປີດ ​ໄມ​ໂຄຣ​ໂຟນ"</item>
+    <item msgid="5906017727368097853">"​ໂປຣ​ເຈັກ​ມີ​ເດຍ"</item>
+    <item msgid="2486614710846178542">"​​ເປີດ​ນຳ​ໃຊ້ VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ສັ້ນ"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ຄ່າເລີ່ມຕົ້ນ"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"ໂຕພິມນ້ອຍ"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"ສະ​ບາຍໆ"</item>
+    <item msgid="7967169925231332424">"ຂຽນເຄືອ"</item>
+    <item msgid="561832997193039673">"ໂຕພິມນ້ອຍ"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"ນ້ອຍຫຼາຍ"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"ບັບ​ເຟີ 64K ​ຕໍ່​ລັອກ"</item>
     <item msgid="2822309747675758628">"ບັບ​ເຟີ 256K ​ຕໍ່​ລັອກ"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Cached (​ການ​ເຄື່ອນ​ໄຫວ​ລູກ​ຂ່າຍ)"</item>
     <item msgid="6652164677254579050">"Cached (​ຫວ່າງ​ເປົ່າ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ສີຂຽວອົມຟ້າ"</item>
+    <item msgid="8332294763632946560">"ຟ້າ"</item>
+    <item msgid="2023216417616991392">"​ສີມ່ວງ​ເຂັ້ມ"</item>
+    <item msgid="3170497246594232819">"ສີມ່ວງ"</item>
+    <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 fff8d26..ea3edcf 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth ລະດັບສູງ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ເມື່ອ Bluetooth ຖືກ​ເປີດ​ນຳ​ໃຊ້, ອຸ​ປະ​ກອນ​ຂອງ​ທ່ານ​ຈະ​ສາ​ມາດ​ສື່​ສານ​ກັບ​ອຸ​ປະ​ກອນ Bluetooth ອື່ນ​ທີ່​ຢູ່​ໃກ້​ຄຽງ​ໄດ້."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ສະແກນ"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ໂຕເລືອກຂັ້ນສູງ"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"ສະ​ແດງ​ແອັບຯ"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"​ສະ​ແດງຄວາມ​ແຮງສັນ​ຍານ WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"​ຈື່​ເຄືອ​ຂ່າຍ​ໄວ້"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ລືມເຄືອຂ່າຍ"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"ໂໝດການໂທ Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi​-Fi ເທົ່າ​ນັ້ນ"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ປິດ"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ເລືອກໃຊ້ Wi-Fi ກ່ອນ (ໃຊ້ເຄືອຂ່າຍເຊລລູລາ ຖ້າ Wi-Fi ບໍ່ສາມາດໃຊ້ງານໄດ້ເທົ່ານັ້ນ)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ເລືອກໃຊ້ເຊລລູລາກ່ອນ (ໃຊ້ Wi-Fi ຖ້າເຄືອຂ່າຍເຊລລູລາບໍ່ສາມາດໃຊ້ງານໄດ້ເທົ່ານັ້ນ)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ສະຖານະແບັດເຕີຣີ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ລະດັບແບັດເຕີຣີ"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"ນີ້ຈະຕັ້ງຄືນທຸກການຕັ້ງຄ່າທີ່ກ່ຽວຂ້ອງກັບການສ້າງເຄືອຂ່າຍເປັນຄ່າເດີມຂອງໂຮງງານ ລວມທັງ:\n\n"<li>"Wifi"</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="1745138973574945389">"ຕັ້ງຄືນທຸກການຕັ້ງຄ່າເຄືອຂ່າຍບໍ? ທ່ານບໍ່ສາມາດປີ້ນຄືນການດຳເນີນການນີ້ໄດ້!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ຕັ້ງຄືນການຕັ້ງຄ່າ"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ທ່ານຈໍາເປັນຕ້ອງແຕ້ມແບບຮູບປົດລັອກຂອງທ່ານເພື່ອຢືນຢັນການຕັ້ງຄືນການຕັ້ງຄ່າເຄືອຂ່າຍ."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ຕັ້ງຄືນບໍ?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ການຕັ້ງຄ່າເຄືອຂ່າຍຖືກຕັ້ງຄືນແລ້ວ"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"ດາວ​ໂຫຼດ​ແອັບ ລະ​ບົບ​ແອັບ​ພ​ລິ​ເຄ​ຊັນ"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"ຄວາມ​ປອດ​ໄພ​ການ​ອະ​ນຸ​ຍາດ​ແອັບ"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d ແອັບໃຫ້ເງື່ອນໄຂ</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"ຕັ້ງ​ຄວາມ​ມັກ​ຄືນ​ໃໝ່​ທົ່ວ​ທຸກ​ແອັບ​ເປັນ​ຄ່າ​ມາດ​ຕະ​ຖານ"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> ແອັບ​ຖືກ​ຕິດ​ຕັ້ງ​ແລ້ວ, ລວມ​ທັງ​ລະ​ບົບ ແລະ​ແອັບ​ທີ່​ດາວ​ໂຫຼດ​ແລ້ວ"</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>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index ec8aa6a..1e663ce 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -86,7 +86,7 @@
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Nuskaitoma..."</item>
-    <item msgid="8513729475867537913">"Jungiama…"</item>
+    <item msgid="8513729475867537913">"Prisijungiama..."</item>
     <item msgid="515055375277271756">"Nustatoma tapatybė..."</item>
     <item msgid="1943354004029184381">"Gaunamas IP adresas..."</item>
     <item msgid="4221763391123233270">"Prisijungta"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Visada"</item>
     <item msgid="844721238536786870">"Tik kai įjungtas į lizdą"</item>
-    <item msgid="2990218920631468642">"Niekada (naudojama daugiau duomenų)"</item>
+    <item msgid="1986753720941888596">"Niekada"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Visada"</item>
     <item msgid="7433294150916905997">"Tik kai įjungtas į lizdą"</item>
     <item msgid="1390404486722375028">"Niekada"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Pastarosios 30 dienų"</item>
+    <item msgid="6600989128423965319">"Nustatyti naudojimo ciklą..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automobiliai"</item>
+    <item msgid="1013988753804838790">"Automatinis"</item>
     <item msgid="6670588712989942178">"Tik 5 GHz"</item>
     <item msgid="2715516524973207876">"Tik 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Naudojimo laikas"</item>
-    <item msgid="3703676222230317933">"Paleisti skaičiavimą"</item>
+    <item msgid="4796160515314745154">"Paskutinį kartą naudota"</item>
     <item msgid="2502754479975776899">"Programos pavadinimas"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"signalo garsumas"</item>
     <item msgid="785049718065337473">"pranešimų garsumas"</item>
     <item msgid="6700305533746877052">"„Bluetooth“ garsumas"</item>
-    <item msgid="3810969981743709839">"nutildyti / įjungti mikrofono garsą"</item>
-    <item msgid="2627903914574908209">"neužmigdyti"</item>
-    <item msgid="1395372654968157578">"stebėti vietovę"</item>
-    <item msgid="3238451051299611853">"stebėti didelio efektyvumo vietovę"</item>
+    <item msgid="2029227495214047094">"neužmigdyti"</item>
+    <item msgid="26109888160231211">"stebėti vietovę"</item>
+    <item msgid="5753382310468855812">"stebėti didelė galia vietovė"</item>
+    <item msgid="3356591542543137332">"gauti naudojimo statistiką"</item>
+    <item msgid="3073734345226842233">"nutildyti / įjungti mikrofono garsą"</item>
+    <item msgid="1148142988678569310">"projektuoti mediją"</item>
+    <item msgid="9130014005474445273">"suaktyvinti VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vietovė"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Signalo garsumas"</item>
     <item msgid="9103719301075748925">"Pranešimo garsumas"</item>
     <item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
-    <item msgid="2265317984004577529">"Nutildyti / įjungti mikrofono garsą"</item>
-    <item msgid="3646325683886507917">"Neužmigdyti"</item>
+    <item msgid="4665183401128289653">"Neužmigdyti"</item>
+    <item msgid="8584357129746649222">"Vietovė"</item>
     <item msgid="7669257279311110599">"Vietovė"</item>
-    <item msgid="7745724368696313169">"Vietovė"</item>
+    <item msgid="3459320345690097795">"Gauti naudojimo statistiką"</item>
+    <item msgid="1312534577834048535">"Nutildyti / įjungti mikrofono garsą"</item>
+    <item msgid="5906017727368097853">"Projektuoti mediją"</item>
+    <item msgid="2486614710846178542">"Suaktyvinti VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Numatytasis"</item>
     <item msgid="1016452621833735880">"Be užraitų"</item>
     <item msgid="2496277987934654454">"Be užraitų, glaustas"</item>
-    <item msgid="4406003087391086325">"Su užraitais"</item>
-    <item msgid="1558362802170124073">"Lygiaplotis"</item>
-    <item msgid="6857338041963571301">"Paprastas"</item>
-    <item msgid="961716102408512888">"Rankraštinis"</item>
-    <item msgid="784581717183349567">"Sumažintos didžiosios raidės"</item>
+    <item msgid="7247838127505318669">"Be užraitų, lygiaplotis"</item>
+    <item msgid="4478414822462359763">"Su užraitais"</item>
+    <item msgid="7502451783483660829">"Su užraitais, lygiaplotis"</item>
+    <item msgid="639503332147461010">"Paprastas"</item>
+    <item msgid="7967169925231332424">"Rankraštinis"</item>
+    <item msgid="561832997193039673">"Sumažintos didžiosios raidės"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Labai mažas"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 KB žurn. bufer."</item>
     <item msgid="2822309747675758628">"256 KB žurn. bufer."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Išsaugota talpykloje (veiklos kliento programa)"</item>
     <item msgid="6652164677254579050">"Išsaugota talpykloje (tuščia)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Žalsvai mėlyna"</item>
+    <item msgid="8332294763632946560">"Mėlyna"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purpurinė"</item>
+    <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 33970df..a94503a 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +320,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>
@@ -350,6 +340,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>
@@ -393,8 +409,6 @@
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Tiesiog. „Wi-Fi“ r."</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Nuskaityti"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Išplėstinis"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Rodyti programas"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Rod. „Wi-Fi“ stipr."</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Prijungti prie tinklo"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Prisiminti tinklą"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pamiršti tinklą"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"„Wi-Fi“ skambinimo režimas"</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>
+    <item msgid="3132912693346866895">"Tik „Wi-Fi“"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Išjungta"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Pageidautinas „Wi-Fi“ ryšys (Mobiliojo ryšio tinklas naudojamas, tik jei „Wi-Fi“ r. t. nepasiek.)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Pageidautinas mobilusis ryšys („Wi-Fi“ ryšio t. naudojamas, tik jei mobiliojo r. tinklas nepasiek.)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Tik „Wi-Fi“ (Mob. r. t. niekada nenaud. Jei „Wi-Fi“ r. t. nepas., negalima atlikti ir gauti skamb.)"</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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Akumuliatoriaus būsena"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumuliatoriaus lygis"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"Atlikus šį veiksmą visi susiję tinklo nustatymai bus iš naujo nustatyti į numatytuosius gamyklinius, įskaitant:\n\n"<li>"„Wi-Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Nustatyti iš naujo"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Iš naujo nustatyti visus tinklo nustatymus? Šio veiksmo negalėsite atšaukti!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Nustatyti iš naujo"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Turėsite nubrėžti atrakinimo piešinį, kad galėtumėte patvirtinti tinklo nustatymų nustatymą iš naujo."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Nustatyti iš naujo?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tinklo nustatymų nustatymas 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>
@@ -1107,6 +1127,8 @@
     <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="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_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>
@@ -1152,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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>
@@ -1704,14 +1726,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>
@@ -1750,7 +1778,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>
@@ -1849,12 +1877,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>
@@ -2026,6 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_all_apps" msgid="5377153522551809915">"programos atsisiųsti programos sistema"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"programų leidimų sauga"</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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d programa pateikia sąlygas</item>
+      <item quantity="few">%d programos pateikia sąlygas</item>
+      <item quantity="many">%d programos pateikia sąlygas</item>
+      <item quantity="other">%d programų 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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Nustatyti iš naujo visų programų nuostatas į numatytąsias"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Įdiegta programų: <xliff:g id="COUNT">%d</xliff:g> (įskaitant sistemos ir atsisiųstas programas)"</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>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 25adc37..00de55a 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Vienmēr"</item>
     <item msgid="844721238536786870">"Tikai ja pieslēgts pie strāvas"</item>
-    <item msgid="2990218920631468642">"Nekad (palielina datu lietojumu)"</item>
+    <item msgid="1986753720941888596">"Nekad"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Vienmēr"</item>
     <item msgid="7433294150916905997">"Tikai ja pieslēgts pie strāvas"</item>
     <item msgid="1390404486722375028">"Nekad"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Pēdējās 30 dienas"</item>
+    <item msgid="6600989128423965319">"Iestatīt lietojuma ciklu…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automātiski"</item>
+    <item msgid="1013988753804838790">"Automātiski"</item>
     <item msgid="6670588712989942178">"Tikai 5 GHz"</item>
     <item msgid="2715516524973207876">"Tikai 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Lietojuma laiks"</item>
-    <item msgid="3703676222230317933">"Palaišanas reižu skaits"</item>
+    <item msgid="4796160515314745154">"Pēdējo reizi izmantots"</item>
     <item msgid="2502754479975776899">"Lietotnes nosaukums"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"signāla skaļums"</item>
     <item msgid="785049718065337473">"paziņojumu skaļums"</item>
     <item msgid="6700305533746877052">"Bluetooth apjoms"</item>
-    <item msgid="3810969981743709839">"izslēgt/ieslēgt mikrofonu"</item>
-    <item msgid="2627903914574908209">"neļaut pāriet miega režīmā"</item>
-    <item msgid="1395372654968157578">"pārraudzīt atrašanās vietu"</item>
-    <item msgid="3238451051299611853">"pārraudzīt lieljaudas atrašanās vietu"</item>
+    <item msgid="2029227495214047094">"neļaut pāriet miega rež."</item>
+    <item msgid="26109888160231211">"pārraudzīt atrašanās vietu"</item>
+    <item msgid="5753382310468855812">"pārraudzīt lieljaudas atrašanās vietu"</item>
+    <item msgid="3356591542543137332">"iegūt lietojuma statistiku"</item>
+    <item msgid="3073734345226842233">"izslēgt/ieslēgt mikrofonu"</item>
+    <item msgid="1148142988678569310">"projicēt saturu"</item>
+    <item msgid="9130014005474445273">"aktivizēt VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Atrašanās vieta"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Signāla skaļums"</item>
     <item msgid="9103719301075748925">"Paziņojumu skaļums"</item>
     <item msgid="7025966722295861512">"Bluetooth apjoms"</item>
-    <item msgid="2265317984004577529">"Izslēgt/ieslēgt mikrofonu"</item>
-    <item msgid="3646325683886507917">"Neļaut pāriet miega režīmā"</item>
+    <item msgid="4665183401128289653">"Neļaut pāriet miega rež."</item>
+    <item msgid="8584357129746649222">"Atrašanās vieta"</item>
     <item msgid="7669257279311110599">"Atrašanās vieta"</item>
-    <item msgid="7745724368696313169">"Atrašanās vieta"</item>
+    <item msgid="3459320345690097795">"Iegūt lietojuma statistiku"</item>
+    <item msgid="1312534577834048535">"Izslēgt/ieslēgt mikrofonu"</item>
+    <item msgid="5906017727368097853">"Projicēt saturu"</item>
+    <item msgid="2486614710846178542">"Aktivizēt VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Noklusējums"</item>
     <item msgid="1016452621833735880">"Bezserifa"</item>
     <item msgid="2496277987934654454">"Saspiests, bezserifa"</item>
-    <item msgid="4406003087391086325">"Serifa"</item>
-    <item msgid="1558362802170124073">"Vienplatuma"</item>
-    <item msgid="6857338041963571301">"Parasts"</item>
-    <item msgid="961716102408512888">"Kursīvs"</item>
-    <item msgid="784581717183349567">"Kapiteļi"</item>
+    <item msgid="7247838127505318669">"Vienplatuma Sans Serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Vienplatuma Serif"</item>
+    <item msgid="639503332147461010">"Parasts"</item>
+    <item msgid="7967169925231332424">"Kursīvs"</item>
+    <item msgid="561832997193039673">"Kapiteļi"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Ļoti mazs"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Izmantot lietotnes noklusējuma vērtības"</item>
+    <item msgid="7009918361545506251">"Pēc noklusējuma"</item>
     <item msgid="1770533843436933500">"Balts uz melna"</item>
     <item msgid="758587126802411846">"Melns uz balta"</item>
     <item msgid="1495307195241623402">"Dzeltens uz melna"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 KB žurn. buferis"</item>
     <item msgid="2822309747675758628">"256 KB žurn. buf."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Saglabāts kešatmiņā (darbības klients)"</item>
     <item msgid="6652164677254579050">"Saglabāts kešatmiņā (tukša)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Zilganzaļa"</item>
+    <item msgid="8332294763632946560">"Zila"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violeta"</item>
+    <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 7391805e..68d2283 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +319,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>
@@ -350,6 +339,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>
@@ -393,8 +407,6 @@
     <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>
@@ -405,7 +417,6 @@
     <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>
@@ -429,30 +440,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>
@@ -482,15 +499,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>
@@ -518,15 +528,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +583,11 @@
     <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>
@@ -626,6 +610,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skenēt"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Papildu"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Rādīt lietotnes"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Rādīt Wi-Fi signālu"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Izveidot savienojumu ar tīklu"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Atcerēties tīklu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Neiegaumēt tīklu"</string>
@@ -641,7 +627,7 @@
     <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>
@@ -667,20 +653,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>
@@ -753,6 +734,23 @@
     <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="3208568886184788972">"Wi-Fi zvanu režīms"</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>
+    <item msgid="3132912693346866895">"Tikai Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2."</item>
+    <item msgid="1171822231056612021">"1."</item>
+    <item msgid="3194458950573886239">"0."</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Izslēgts"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Vēlams Wi-Fi tīkls (Izmanto mobilo tīklu tikai tad, ja Wi-Fi tīkls nav pieejams.)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Vēlams mobilais tīkls (Izmanto Wi-Fi tīklu tikai tad, ja nav pieejams mobilais tīkls.)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Tikai Wi-Fi (Neizmanto mobilo tīklu. Nevar veikt vai saņemt zvanus, ja Wi-Fi tīkls nav pieejams.)"</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>
@@ -816,6 +814,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>
@@ -867,10 +870,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>
@@ -964,7 +968,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Akumulatora statuss"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Akumulatora uzlādes līmenis"</string>
@@ -1009,10 +1014,16 @@
     <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="5805796658276223307">"Visi ar tīklošanu saistītie iestatījumi tiks atiestatīti uz rūpnīcas noklusējuma iestatījumiem. Tas attiecas arī uz šādiem iestatījumiem: \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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Lai apstiprinātu tīkla iestatījumu atiestatīšanu, norādiet savu grafisko atslēgu."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vai atiestatīt?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tīkla iestatījumu atiestatīšana"</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>
@@ -1107,6 +1118,8 @@
     <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="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_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>
@@ -1152,7 +1165,7 @@
     <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="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>
@@ -1398,17 +1411,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>
@@ -1447,19 +1449,29 @@
     <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>
@@ -1563,6 +1575,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>
@@ -1704,14 +1717,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>
@@ -1750,7 +1769,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>
@@ -1849,12 +1868,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>
@@ -2026,6 +2043,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>
@@ -2228,13 +2249,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>
@@ -2285,8 +2306,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>
@@ -2351,13 +2372,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>
@@ -2374,6 +2397,10 @@
     <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_all_apps" msgid="5377153522551809915">"lietotnes lejupielādēt lietojumprogrammas sistēma"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2445,33 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="zero">Nosacījumi sniegti %d lietotnēs</item>
+      <item quantity="one">Nosacījumi sniegti %d lietotnē</item>
+      <item quantity="other">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>
@@ -2514,4 +2545,41 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Atiestatiet visu lietotņu preferences uz noklusējuma vērtībām"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Instalētas <xliff:g id="COUNT">%d</xliff:g> lietotnes, tostarp lejupielādētās un sistēmas lietotnes"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-mk-rMK-nokeys/strings.xml b/res/values-mk-rMK-nokeys/strings.xml
new file mode 100644
index 0000000..86e7c42
--- /dev/null
+++ b/res/values-mk-rMK-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Управувај со апликации"</string>
+</resources>
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk-rMK/arrays.xml
index 1ea2b6c..c5cd9f9 100644
--- a/res/values-mk-rMK/arrays.xml
+++ b/res/values-mk-rMK/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -136,7 +135,7 @@
     <item msgid="1701505390737218306">"Поврзано"</item>
     <item msgid="3189211552661432651">"Покането"</item>
     <item msgid="3206450250360237549">"Неуспешено"</item>
-    <item msgid="7785896708926971207">"Достапен"</item>
+    <item msgid="7785896708926971207">"Слободен"</item>
     <item msgid="2330782789550628803">"Надвор од опсег"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Секогаш"</item>
     <item msgid="844721238536786870">"Само кога е вклучено"</item>
-    <item msgid="2990218920631468642">"Никогаш (зголемува искористување на податоци)"</item>
+    <item msgid="1986753720941888596">"Никогаш"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Секогаш"</item>
     <item msgid="7433294150916905997">"Само кога е вклучено"</item>
     <item msgid="1390404486722375028">"Никогаш"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Последните 30 дена"</item>
+    <item msgid="6600989128423965319">"Пост. цикл. на корист...."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Автоматски"</item>
+    <item msgid="1013988753804838790">"Автоматски"</item>
     <item msgid="6670588712989942178">"Само 5 GHz"</item>
     <item msgid="2715516524973207876">"Само 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Време на употреба"</item>
-    <item msgid="3703676222230317933">"Број на стартирања"</item>
+    <item msgid="4796160515314745154">"Користено последен пат"</item>
     <item msgid="2502754479975776899">"Име на апликација"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"јачина на звук на аларм"</item>
     <item msgid="785049718065337473">"јачина на звук на известување"</item>
     <item msgid="6700305533746877052">"јачина на звук на Bluetooth"</item>
-    <item msgid="3810969981743709839">"вклучи/исклучи звук на микрофон"</item>
-    <item msgid="2627903914574908209">"остани активен"</item>
-    <item msgid="1395372654968157578">"следи локација"</item>
-    <item msgid="3238451051299611853">"следи локација од големо значење"</item>
+    <item msgid="2029227495214047094">"остани активен"</item>
+    <item msgid="26109888160231211">"следи локација"</item>
+    <item msgid="5753382310468855812">"следи локација од големо значење"</item>
+    <item msgid="3356591542543137332">"добиј статистики за користење"</item>
+    <item msgid="3073734345226842233">"вклучи/исклучи звук на микрофон"</item>
+    <item msgid="1148142988678569310">"проектирај медиуми"</item>
+    <item msgid="9130014005474445273">"активирај ВПН"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Локација"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Јачина на звук на аларм"</item>
     <item msgid="9103719301075748925">"Јачина на звук на известување"</item>
     <item msgid="7025966722295861512">"Јачина на звук на Bluetooth"</item>
-    <item msgid="2265317984004577529">"Вклучи/исклучи звук на микрофон"</item>
-    <item msgid="3646325683886507917">"Остани активен"</item>
+    <item msgid="4665183401128289653">"Остани активен"</item>
+    <item msgid="8584357129746649222">"Локација"</item>
     <item msgid="7669257279311110599">"Локација"</item>
-    <item msgid="7745724368696313169">"Локација"</item>
+    <item msgid="3459320345690097795">"Добиј статистики за користење"</item>
+    <item msgid="1312534577834048535">"Вклучи/исклучи звук на микрофон"</item>
+    <item msgid="5906017727368097853">"Проектирај медиуми"</item>
+    <item msgid="2486614710846178542">"Активирај ВПН"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Стандардни"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-Serif збиени"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Со еднаква широчина"</item>
-    <item msgid="6857338041963571301">"Обични"</item>
-    <item msgid="961716102408512888">"Курзив"</item>
-    <item msgid="784581717183349567">"Мали големи букви"</item>
+    <item msgid="7247838127505318669">"Sans-serif со еднаква ширина"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif со еднаква ширина"</item>
+    <item msgid="639503332147461010">"Обичен"</item>
+    <item msgid="7967169925231332424">"Курзив"</item>
+    <item msgid="561832997193039673">"Мали големи букви"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Многу мали"</item>
@@ -375,6 +385,11 @@
     <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.000"</item>
+    <item msgid="3534782711045262344">"256.000"</item>
+    <item msgid="8085867209202153403">"1 M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 K/меѓумеморија"</item>
     <item msgid="2822309747675758628">"256 K/меѓумеморија"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кеширана (клиент за активност)"</item>
     <item msgid="6652164677254579050">"Кеширана (празна)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Тиркизна"</item>
+    <item msgid="8332294763632946560">"Сина"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Виолетова"</item>
+    <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 33efdf8..5235b91 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>
@@ -137,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>
@@ -156,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>
@@ -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">"Подеси „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напреден Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Кога е вклучен Bluetooth, уредот може да комуницира со други уреди со Bluetooth во близина."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредни"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Прикажи апликации"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Прикажи Wi-Fi јачина"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Поврзи се на мрежа"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Запомни мрежа"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Заборави мрежа"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Режим – повикување преку Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Само Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Исклучено"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Се претпочита Wi-Fi (Користи мобилна мрежа само ако Wi-Fi не е достапна)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Се претпочита мобилна (Користи Wi-Fi само ако не е достапна мобилна мрежа)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Само 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Статус на батеријата"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерија"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Ова ќе ги ресетира на стандардните вредности сите поставки поврзани со мрежата, вклучувајќи:\n\n"<li>"Wifi"</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="1745138973574945389">"Ресетирај ги сите мрежни поставки? Не може да се врати ова дејство!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетирај поставки"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Треба да ја употребите шемата за отклучување за да потврдите ресетирање на мрежните поставки."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Ресетирај?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ресетирање мрежни поставки"</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>
@@ -1107,6 +1109,8 @@
     <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">"Користи ГПС за да се утврди локацијата"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"Се скенира"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Се скенира"</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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"апликации преземање систем"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d апликација обезбедува услови</item>
+      <item quantity="other">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Ресетирај ги претпочитањата за сите апликации на стандардни"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> инсталирани апликации, вклучувајќи системски и преземени апликации"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Напредни"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Непозната апликација"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Изберете профил"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-ml-rIN-nokeys/strings.xml b/res/values-ml-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..97e3729
--- /dev/null
+++ b/res/values-ml-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"അപ്ലിക്കേഷനുകൾ നിയന്ത്രിക്കുക"</string>
+</resources>
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml-rIN/arrays.xml
index 94f69be..340d7f2 100644
--- a/res/values-ml-rIN/arrays.xml
+++ b/res/values-ml-rIN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -129,8 +128,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"പുഷ് ബട്ടൺ"</item>
-    <item msgid="1624323946324499595">"പിയർ ഉപകരണത്തിൽ നിന്നുള്ള PIN"</item>
-    <item msgid="5366790421523328066">"ഈ ഉപകരണത്തിൽ നിന്നുള്ള PIN"</item>
+    <item msgid="1624323946324499595">"പിയർ ഉപകരണത്തിൽ നിന്നുള്ള പിൻ"</item>
+    <item msgid="5366790421523328066">"ഈ ഉപകരണത്തിൽ നിന്നുള്ള പിൻ"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"കണക്റ്റുചെയ്‌തു"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"എല്ലായ്പ്പോഴും"</item>
     <item msgid="844721238536786870">"പ്ലഗ്ഗുചെയ്‌തിരിക്കുമ്പോൾ മാത്രം"</item>
-    <item msgid="2990218920631468642">"ഒരിക്കലുമില്ല (ഡാറ്റ ഉപയോഗം വർദ്ധിക്കുന്നു)"</item>
+    <item msgid="1986753720941888596">"ഒരിക്കലുമില്ല"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"എല്ലായ്പ്പോഴും"</item>
     <item msgid="7433294150916905997">"പ്ലഗ്ഗുചെയ്‌തിരിക്കുമ്പോൾ മാത്രം"</item>
     <item msgid="1390404486722375028">"ഒരിക്കലുമില്ല"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"കഴിഞ്ഞ 30 ദിവസം"</item>
+    <item msgid="6600989128423965319">"ഉപയോഗ സൈക്കിൾ സജ്ജമാക്കുക..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"യാന്ത്രികം"</item>
+    <item msgid="1013988753804838790">"യാന്ത്രികമായി"</item>
     <item msgid="6670588712989942178">"5 GHz മാത്രം"</item>
     <item msgid="2715516524973207876">"2.4 GHz മാത്രം"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"ഉപയോഗ സമയം"</item>
-    <item msgid="3703676222230317933">"സമാരംഭിക്കുന്ന എണ്ണം"</item>
+    <item msgid="4796160515314745154">"അവസാനം ഉപയോഗിച്ചത്"</item>
     <item msgid="2502754479975776899">"അപ്ലിക്കേഷൻ പേര്"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -228,7 +231,7 @@
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"ലൊക്കേഷൻ"</item>
     <item msgid="255608127647030286">"വ്യക്തിഗതം"</item>
-    <item msgid="4588829735729884491">"സന്ദേശമയയ്‌ക്കൽ"</item>
+    <item msgid="4588829735729884491">"സന്ദേശം"</item>
     <item msgid="886742181977884584">"മീഡിയ"</item>
     <item msgid="7924928667052300589">"ഉപകരണം"</item>
   </string-array>
@@ -272,11 +275,14 @@
     <item msgid="6325739889222559394">"മീഡിയ വോളിയം"</item>
     <item msgid="5762123934816216821">"അലാറം വോളിയം"</item>
     <item msgid="785049718065337473">"അറിയിപ്പ് വോളിയം"</item>
-    <item msgid="6700305533746877052">"bluetooth വോളിയം"</item>
-    <item msgid="3810969981743709839">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
-    <item msgid="2627903914574908209">"സജീവമായി തുടരുക"</item>
-    <item msgid="1395372654968157578">"ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
-    <item msgid="3238451051299611853">"ഉയർന്ന പവർ ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="6700305533746877052">"ബ്ലൂടൂത്ത് വോളിയം"</item>
+    <item msgid="2029227495214047094">"സജീവമായി തുടരുക"</item>
+    <item msgid="26109888160231211">"ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="5753382310468855812">"ഉയർന്ന പവർ ലൊക്കേഷൻ നിരീക്ഷിക്കുക"</item>
+    <item msgid="3356591542543137332">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ നേടുക"</item>
+    <item msgid="3073734345226842233">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
+    <item msgid="1148142988678569310">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
+    <item msgid="9130014005474445273">"VPN സജീവമാക്കുക"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ലൊക്കേഷൻ"</item>
@@ -318,11 +324,14 @@
     <item msgid="7878027809189330917">"മീഡിയ വോളിയം"</item>
     <item msgid="7260546305036218513">"അലാറം വോളിയം"</item>
     <item msgid="9103719301075748925">"അറിയിപ്പ് വോളിയം"</item>
-    <item msgid="7025966722295861512">"Bluetooth വോളിയം"</item>
-    <item msgid="2265317984004577529">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
-    <item msgid="3646325683886507917">"സജീവമായി തുടരുക"</item>
+    <item msgid="7025966722295861512">"ബ്ലൂടൂത്ത് വോളിയം"</item>
+    <item msgid="4665183401128289653">"സജീവമായി തുടരുക"</item>
+    <item msgid="8584357129746649222">"ലൊക്കേഷൻ"</item>
     <item msgid="7669257279311110599">"ലൊക്കേഷൻ"</item>
-    <item msgid="7745724368696313169">"ലൊക്കേഷൻ"</item>
+    <item msgid="3459320345690097795">"ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ നേടുക"</item>
+    <item msgid="1312534577834048535">"മൈക്രോഫോൺ മ്യൂട്ടുചെയ്യുക/അൺമ്യൂട്ടുചെയ്യുക"</item>
+    <item msgid="5906017727368097853">"പ്രോജക്‌റ്റ് മീഡിയ"</item>
+    <item msgid="2486614710846178542">"VPN സജീവമാക്കുക"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"ഹ്രസ്വമായത്"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"സ്ഥിരമായത്"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif കട്ടിയുള്ളത്"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"മോണോസ്‌പെയ്സ്"</item>
-    <item msgid="6857338041963571301">"സാധാരണം"</item>
-    <item msgid="961716102408512888">"കൂട്ടെഴുത്ത്"</item>
-    <item msgid="784581717183349567">"ചെറിയ കാപ്പിറ്റലുകൾ"</item>
+    <item msgid="7247838127505318669">"Sans-serif മോണോസ്പെയ്സ്"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif മോണോസ്പെയ്സ്"</item>
+    <item msgid="639503332147461010">"സാധാരണം"</item>
+    <item msgid="7967169925231332424">"കൂട്ടെഴുത്ത്"</item>
+    <item msgid="561832997193039673">"ചെറിയ കാപ്പിറ്റലുകൾ"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"തീരെ ചെറുത്"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"ഓരോ ലോഗ് ബഫറിനും 64K"</item>
     <item msgid="2822309747675758628">"ഓരോ ലോഗ് ബഫറിനും 256K"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"കാഷെചെയ്‌തു (പ്രവർത്തന ക്ലയന്റ്)"</item>
     <item msgid="6652164677254579050">"കാഷെചെയ്‌തു (ശൂന്യം)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"ടീല്‍"</item>
+    <item msgid="8332294763632946560">"നീല"</item>
+    <item msgid="2023216417616991392">"ഇൻഡിഗോ"</item>
+    <item msgid="3170497246594232819">"പര്‍പ്പിള്‍"</item>
+    <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 20ec716..3cdbba9 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>
@@ -137,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>
@@ -156,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>
@@ -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">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"വിപുലമായ ബ്ലൂടൂത്ത്"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ബ്ലൂടൂത്ത് ഓണായിരിക്കുമ്പോൾ, സമീപമുള്ള മറ്റു ബ്ലൂടൂത്ത് ഉപകരണങ്ങളുമായി നിങ്ങളുടെ ഉപകരണത്തിന് ആശയവിനിമയം നടത്താനാകും."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ഡയറക്‌ട്"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"വിപുലമായത്"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"അപ്ലിക്കേഷനുകൾ കാണിക്കുക"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"വൈഫൈ ശക്തി കാണിക്കുക"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"നെ‌റ്റ്‌വർക്കിൽ കണക്‌റ്റുചെയ്യുക"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"നെറ്റ്‌വർക്ക് ഓർമ്മിക്കുക"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"നെറ്റ്‌വർക്ക് മറക്കുക"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi കോളിംഗ് മോഡ്"</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>
+    <item msgid="3132912693346866895">"Wi-Fi മാത്രം"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ഓഫ്"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi തിരഞ്ഞെടുത്തിരിക്കുന്നു (Wi-Fi ലഭ്യമല്ലെങ്കിൽ മാത്രം സെൽ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കുന്നു)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"സെല്ലുലാർ തിരഞ്ഞെടുത്തിരിക്കുന്നു (സെൽ നെറ്റ്‌വർക്ക് ലഭ്യമല്ലെങ്കിൽ മാത്രം Wi-Fi ഉപയോഗിക്കുന്നു)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ബാറ്ററി നില"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ബാറ്ററി നില"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">\n\n<li>"Wifi"</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="1745138973574945389">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റുചെയ്യണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ക്രമീകരണം റീസെറ്റുചെയ്യുക"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ഒരു നെറ്റ്‌വർക്ക് ക്രമീകരണ റീസെറ്റ് സ്ഥിരീകരിക്കാൻ നിങ്ങൾ അൺലോക്ക് പാറ്റേൺ വരയ്‌ക്കേണ്ടതുണ്ട്."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"റീസെറ്റുചെയ്യണോ?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്യുക"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"ആപ്സ് ഡൗൺലോഡ് അപ്ലിക്കേഷൻ സിസ്റ്റം"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"അപ്ലിക്കേഷൻ അനുമതി സുരക്ഷ"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d അപ്ലിക്കേഷനുകൾ, വ്യവസ്ഥകൾ നൽകുന്നു</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"എല്ലാ അപ്ലിക്കേഷനുകളിലുമുള്ള മുൻഗണനകൾ സ്ഥിരമായവകളിലേക്ക് റീസെറ്റുചെയ്യുക"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"സിസ്റ്റം, ഡൗൺലോഡുചെയ്‌ത അപ്ലിക്കേഷനുകൾ എന്നിവ ഉൾപ്പെടെ <xliff:g id="COUNT">%d</xliff:g> അപ്ലിക്കേഷനുകൾ ഇൻസ്റ്റാളുചെയ്‌തു"</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>
 </resources>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index 5e0b88d..0a4d8fc 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Байнга"</item>
     <item msgid="844721238536786870">"Зөвхөн залгасан үед"</item>
-    <item msgid="2990218920631468642">"Хэзээ ч үгүй (дата ашиглалтыг нэмэгдүүлдэг)"</item>
+    <item msgid="1986753720941888596">"Хэзээ ч үгүй"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Байнга"</item>
     <item msgid="7433294150916905997">"Зөвхөн залгасан үед"</item>
     <item msgid="1390404486722375028">"Хэзээ ч үгүй"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Сүүлийн 30 өдөр"</item>
+    <item msgid="6600989128423965319">"Ашиглалтын циклийг тохируулах..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Автомат"</item>
+    <item msgid="1013988753804838790">"Автоматаар"</item>
     <item msgid="6670588712989942178">"Зөвхөн 5 GHz"</item>
     <item msgid="2715516524973207876">"Зөвхөн 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Ашиглалтын цаг"</item>
-    <item msgid="3703676222230317933">"Тооллогыг эхлүүлэх"</item>
+    <item msgid="4796160515314745154">"Ашигласан сүүлийн цаг"</item>
     <item msgid="2502754479975776899">"Апп нэр"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"сэрүүлгийн дууны хэмжээ"</item>
     <item msgid="785049718065337473">"мэдэгдлийн дууны хэмжээ"</item>
     <item msgid="6700305533746877052">"блютүүтийн хэмжээ"</item>
-    <item msgid="3810969981743709839">"Микрофон хаах/нээх"</item>
-    <item msgid="2627903914574908209">"сэрүүн байлгах"</item>
-    <item msgid="1395372654968157578">"байршлыг хянах"</item>
-    <item msgid="3238451051299611853">"өндөр чадалтай байршлуудыг хянах"</item>
+    <item msgid="2029227495214047094">"сэрүүн байлгах"</item>
+    <item msgid="26109888160231211">"байршлыг хянах"</item>
+    <item msgid="5753382310468855812">"өндөр чадалтай байршлуудыг хянах"</item>
+    <item msgid="3356591542543137332">"ашиглалтын статистик авах"</item>
+    <item msgid="3073734345226842233">"Микрофон хаах/нээх"</item>
+    <item msgid="1148142988678569310">"төслийн медиа"</item>
+    <item msgid="9130014005474445273">"VPN идэвхжүүлэх"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Байршил"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Сэрүүлгийн дууны хэмжээ"</item>
     <item msgid="9103719301075748925">"Мэдэгдлийн дууны хэмжээ"</item>
     <item msgid="7025966722295861512">"Блютүүтийн хэмжээ"</item>
-    <item msgid="2265317984004577529">"Микрофон хаах/нээх"</item>
-    <item msgid="3646325683886507917">"Сэрүүн байлгах"</item>
+    <item msgid="4665183401128289653">"Сэрүүн байлгах"</item>
+    <item msgid="8584357129746649222">"Байршил"</item>
     <item msgid="7669257279311110599">"Байршил"</item>
-    <item msgid="7745724368696313169">"Байршил"</item>
+    <item msgid="3459320345690097795">"Ашиглалтын статистик авах"</item>
+    <item msgid="1312534577834048535">"Микрофон хаах/нээх"</item>
+    <item msgid="5906017727368097853">"Төслийн медиа"</item>
+    <item msgid="2486614710846178542">"VPN идэвхжүүлэх"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Богино"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Үндсэн"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Энгийн"</item>
-    <item msgid="961716102408512888">"Үргэлжилсэн"</item>
-    <item msgid="784581717183349567">"Жижиг дармал"</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">"Маш жижиг"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1М"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"лог буфер бүрт 64K"</item>
     <item msgid="2822309747675758628">"лог буфер бүрт 256K"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кеш хийгдсэн (үйлдэлийн клиент)"</item>
     <item msgid="6652164677254579050">"Кеш хийгдсэн (хоосон)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Усан цэнхэр"</item>
+    <item msgid="8332294763632946560">"Цэнхэр"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Нил ягаан"</item>
+    <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 0211121..ca3d03b 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ТИЙМ"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +481,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>
@@ -518,15 +510,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Блютүүт дэлгэрэнгүй"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Блютүүтийг идэвхжүүлсэн үед таны төхөөрөмж ойролцоо байгаа Блютүүт төхөөрөмжүүдтэй холбогдох боломжтой болно."</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 +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>
@@ -595,15 +565,11 @@
     <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>
@@ -626,6 +592,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Шууд"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скан хийх"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дэлгэрэнгүй"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Апп-уудыг харуулах"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi хүч харуулах"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Сүлжээнд холбогдох"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Сүлжээг сана"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Сүлжээг мартах"</string>
@@ -641,7 +609,7 @@
     <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>
@@ -667,20 +635,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>
@@ -753,6 +716,23 @@
     <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="3208568886184788972">"Wi-Fi дуудах горим"</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>
+    <item msgid="3132912693346866895">"Зөвхөн Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Идэвхгүй"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi илүүд эрхэмлэдэг (Wi-Fi байхгүй тохиолдолд зөвхөн үүрэн сүлжээг ашигладаг)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Үүрэн сүлжээг эрхэмлэх (Үүрэн сүлжээг ашиглах боломжгүй байгаа тохиолдолд зөвхөн Wi-Fi ашигладаг)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Зөвхөн 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>
@@ -816,6 +796,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>
@@ -867,10 +852,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>
@@ -964,7 +949,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Зайны статус"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Зайны түвшин"</string>
@@ -1009,10 +995,16 @@
     <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="5805796658276223307">"Энэ нь сүлжээтэй холбоотой бүх тохиргоог үйлдвэрийн тохиргоонд шилжүүлнэ.Үүнд:\n\n"<li>"Wifi"</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="1745138973574945389">"Бүх сүлжээний тохиргоог дахин тохируулах уу? Та энэ үйлдлийг буцаах боломжгүй!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Дахин тохируулах"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Сүлжээний тохиргооны өөрчлөлтийг баталгаажуулахын тулд түгжээгээ тайлна уу."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Дахин тохируулах уу?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Сүлжээний тохиргоог дахин тохируулах"</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>
@@ -1107,6 +1099,8 @@
     <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_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>
@@ -1152,7 +1146,7 @@
     <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="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>
@@ -1398,17 +1392,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>
@@ -1447,19 +1430,29 @@
     <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>
@@ -1563,6 +1556,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 +1698,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>
@@ -1750,7 +1750,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>
@@ -1849,12 +1849,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 +2024,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>
@@ -2228,13 +2230,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>
@@ -2285,8 +2287,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 +2353,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>
@@ -2374,6 +2378,9 @@
     <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_all_apps" msgid="5377153522551809915">"апп, апп татах, систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апп-уудын зөвшөөрлийн аюулгүй байдал"</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>
@@ -2418,29 +2425,27 @@
     <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.format failed for translation -->
+    <!-- no translation found for manage_condition_providers_summary_nonzero (1398308139164964218) -->
     <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>
@@ -2514,4 +2519,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Бүх апп дээрх эрхэмлэх тохиргоог анхны хэлбэрт оруулах"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> апп суулгасан байна. Үүнд системийн болон татаж авсан апп-уудыг оруулсан"</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>
 </resources>
diff --git a/res/values-mr-rIN-nokeys/strings.xml b/res/values-mr-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..3d5a6a8
--- /dev/null
+++ b/res/values-mr-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"अनुप्रयोग व्‍यवस्‍थापित करा"</string>
+</resources>
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr-rIN/arrays.xml
index 0460b26..4b9d57e 100644
--- a/res/values-mr-rIN/arrays.xml
+++ b/res/values-mr-rIN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"नेहमी"</item>
     <item msgid="844721238536786870">"फक्त प्लग इन केलेले असते तेव्हा"</item>
-    <item msgid="2990218920631468642">"कधीही नाही (डेटा वापर वाढवते)"</item>
+    <item msgid="1986753720941888596">"कधीही नाही"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"नेहमी"</item>
     <item msgid="7433294150916905997">"फक्त प्लग इन केलेले असते तेव्हा"</item>
     <item msgid="1390404486722375028">"कधीही नाही"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"अंतिम 30 दिवस"</item>
+    <item msgid="6600989128423965319">"वापर चक्र सेट करा..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"स्वयंचलित"</item>
+    <item msgid="1013988753804838790">"स्वयंचलित"</item>
     <item msgid="6670588712989942178">"5 GHz फक्त"</item>
     <item msgid="2715516524973207876">"2.4 GHz फक्त"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"वापर वेळ"</item>
-    <item msgid="3703676222230317933">"लाँच गणना"</item>
+    <item msgid="4796160515314745154">"अंतिम वेळी वापरलेले"</item>
     <item msgid="2502754479975776899">"अॅप नाव"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -243,7 +246,7 @@
     <item msgid="6546959730920410907">"कॉल लॉग सुधारित करा"</item>
     <item msgid="446877710771379667">"कॅलेंडर वाचा"</item>
     <item msgid="7674458294386319722">"कॅलेंडर सुधारित करा"</item>
-    <item msgid="8281201165558093009">"Wi-Fi स्कॅन"</item>
+    <item msgid="8281201165558093009">"वाय-फाय स्कॅन"</item>
     <item msgid="8694611243479480497">"सूचना"</item>
     <item msgid="7776439107987345446">"सेल स्कॅन"</item>
     <item msgid="514615766544675057">"फोनवर कॉल करा"</item>
@@ -272,11 +275,14 @@
     <item msgid="6325739889222559394">"मीडिया व्हॉल्यूम"</item>
     <item msgid="5762123934816216821">"अलार्म व्हॉल्यूम"</item>
     <item msgid="785049718065337473">"सूचना व्हॉल्यूम"</item>
-    <item msgid="6700305533746877052">"Bluetooth व्हॉल्यूम"</item>
-    <item msgid="3810969981743709839">"आपला मायक्रोफोन निःशब्द/सशब्द करा"</item>
-    <item msgid="2627903914574908209">"सक्रिय ठेवा"</item>
-    <item msgid="1395372654968157578">"स्थानाचे परीक्षण करा"</item>
-    <item msgid="3238451051299611853">"उच्च उर्जा स्थानाचे परीक्षण करा"</item>
+    <item msgid="6700305533746877052">"ब व्हॉल्यूम"</item>
+    <item msgid="2029227495214047094">"सक्रिय ठेवा"</item>
+    <item msgid="26109888160231211">"स्थानाचे परीक्षण करा"</item>
+    <item msgid="5753382310468855812">"उच्च उर्जा स्थानाचे परीक्षण करा"</item>
+    <item msgid="3356591542543137332">"वापर आकडेवारी मिळवा"</item>
+    <item msgid="3073734345226842233">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
+    <item msgid="1148142988678569310">"प्रोजेक्‍ट मीडिया"</item>
+    <item msgid="9130014005474445273">"VPN सक्रिय करा"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -318,11 +324,14 @@
     <item msgid="7878027809189330917">"मीडिया व्हॉल्यूम"</item>
     <item msgid="7260546305036218513">"अलार्म व्हॉल्यूम"</item>
     <item msgid="9103719301075748925">"सूचना व्हॉल्यूम"</item>
-    <item msgid="7025966722295861512">"Bluetooth व्हॉल्यूम"</item>
-    <item msgid="2265317984004577529">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
-    <item msgid="3646325683886507917">"सक्रिय ठेवा"</item>
+    <item msgid="7025966722295861512">"ब व्हॉल्यूम"</item>
+    <item msgid="4665183401128289653">"सक्रिय ठेवा"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
     <item msgid="7669257279311110599">"स्थान"</item>
-    <item msgid="7745724368696313169">"स्थान"</item>
+    <item msgid="3459320345690097795">"वापर आकडेवारी मिळवा"</item>
+    <item msgid="1312534577834048535">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
+    <item msgid="5906017727368097853">"प्रोजेक्‍ट मीडिया"</item>
+    <item msgid="2486614710846178542">"VPN सक्रिय करा"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"लहान"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"डीफॉल्ट"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans-serif संक्षिप्त"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"अनौपचारिक"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Small capitals"</item>
+    <item msgid="7247838127505318669">"Sans-serif मोनोस्पेस"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif मोनोस्पेस"</item>
+    <item msgid="639503332147461010">"अनौपचारिक"</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">"खूप लहान"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"प्रति लॉग बफर 64K"</item>
     <item msgid="2822309747675758628">"प्रति लॉग बफर 256K"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"कॅशे केलेला (क्रियाकलाप क्लायंट)"</item>
     <item msgid="6652164677254579050">"कॅशे केलेला (रिक्त)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"हिरवट निळा"</item>
+    <item msgid="8332294763632946560">"निळा"</item>
+    <item msgid="2023216417616991392">"नीळ"</item>
+    <item msgid="3170497246594232819">"जांभळा"</item>
+    <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 10c5562..f4b2011 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>
@@ -137,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>
@@ -156,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>
@@ -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">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"प्रगत ब"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब चालू असते तेव्हा, आपले डिव्हाइस इतर जवळच्या ब डिव्हाइसेससह संप्रेषण करु शकते."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाय-फाय थेट"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कॅन करा"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"प्रगत"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"अॅप्स दर्शवा"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"वायफाय सामर्थ्य दर्शवा"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्कवर कनेक्ट करा"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"नेटवर्क लक्षात ठेवा"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क विसरा"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"वाय-फाय कॉलिंग मोड"</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>
+    <item msgid="3132912693346866895">"केवळ वाय-फाय"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"बंद"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"वाय-फाय प्राधान्यकृत (वाय-फाय उपलब्‍ध नसते केवळ तेव्‍हाच सेल नेटवर्क वापरते)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"सेल्युलर प्राधान्यकृत (सेल नेटवर्क उपलब्‍ध नसते केवळ तेव्हाच वाय-फाय वापरते)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"केवळ वाय-फाय (सेल नेटवर्क कधीही वापरत नाही. वाय-फाय उपलब्ध नसल्यास कॉल करू किंवा प्राप्त करू शकत नाही)"</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 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"बॅटरी स्थिती"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"बॅटरी पातळी"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"यांच्या समावेशासह हे फॅक्‍टरी डीफॉल्टच्या नेटवर्किंग संबंधित सर्व सेटिंग्ज रीसेट करेल: \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="1745138973574945389">"सर्व नेटवर्क सेटिंग्ज रीसेट करायच्या? आपण ही क्रिया उलट करू शकत नाही!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिंग्ज रीसेट करा"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"नेटवर्क सेटिंग्ज रीसेटचे पुष्‍टीकरण करण्‍यासाठी आपल्‍याला आपला अनलॉक नमुना रेखांकित करण्‍याची आवश्यकता आहे."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"रीसेट करायचे?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"नेटवर्क सेटिंग्ज रीसेट केले"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"स्थान निर्धारीत करण्यासाठी GPS चा वापर करा"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्कॅन करत आहे"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्कॅन करत आहे"</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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"अॅप्स डाउनलोड अनुप्रयोग सिस्टीम"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"अॅप्स परवानग्या सुरक्षितता"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d अॅप्स नियम प्रदान करतात</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"सर्व अॅप्सवरील प्राधान्ये डीफॉल्‍टमध्ये रीसेट करा"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"सिस्टीम आणि डाउनलोड केलेल्या अॅप्ससह, <xliff:g id="COUNT">%d</xliff:g> अॅप्स स्थापित झाले"</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>
 </resources>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index df65bdb..7df69a2 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sentiasa"</item>
     <item msgid="844721238536786870">"Hanya apabila dipalamkan"</item>
-    <item msgid="2990218920631468642">"Jangan sekali-kali (menaikkan penggunaan data)"</item>
+    <item msgid="1986753720941888596">"Jangan sekali-kali"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sentiasa"</item>
     <item msgid="7433294150916905997">"Hanya apabila dipasang"</item>
     <item msgid="1390404486722375028">"Jangan sekali-kali"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 hari terakhir"</item>
+    <item msgid="6600989128423965319">"Ttpkn kitar penggunaan..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Auto"</item>
+    <item msgid="1013988753804838790">"Automatik"</item>
     <item msgid="6670588712989942178">"5 GHz sahaja"</item>
     <item msgid="2715516524973207876">"2.4 GHz sahaja"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Masa penggunaan"</item>
-    <item msgid="3703676222230317933">"Lancarkan kiraan"</item>
+    <item msgid="4796160515314745154">"Kali terakhir digunakan"</item>
     <item msgid="2502754479975776899">"Nama aplikasi"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"kelantangan penggera"</item>
     <item msgid="785049718065337473">"kelantangan pemberitahuan"</item>
     <item msgid="6700305533746877052">"kelantangan bluetooth"</item>
-    <item msgid="3810969981743709839">"redam/nyahredam mikrofon"</item>
-    <item msgid="2627903914574908209">"kekal berjaga"</item>
-    <item msgid="1395372654968157578">"pantau lokasi"</item>
-    <item msgid="3238451051299611853">"awasi lokasi kuasa tinggi"</item>
+    <item msgid="2029227495214047094">"kekal berjaga"</item>
+    <item msgid="26109888160231211">"pantau lokasi"</item>
+    <item msgid="5753382310468855812">"awasi lokasi kuasa tinggi"</item>
+    <item msgid="3356591542543137332">"dapatkan statistik penggunaan"</item>
+    <item msgid="3073734345226842233">"redam/nyahredam mikrofon"</item>
+    <item msgid="1148142988678569310">"media projek"</item>
+    <item msgid="9130014005474445273">"aktifkan VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasi"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Kelantangan penggera"</item>
     <item msgid="9103719301075748925">"Kelantangan pemberitahuan"</item>
     <item msgid="7025966722295861512">"Kelantangan Bluetooth"</item>
-    <item msgid="2265317984004577529">"Redam/nyahredam mikrofon"</item>
-    <item msgid="3646325683886507917">"Kekal berjaga"</item>
+    <item msgid="4665183401128289653">"Kekal berjaga"</item>
+    <item msgid="8584357129746649222">"Lokasi"</item>
     <item msgid="7669257279311110599">"Lokasi"</item>
-    <item msgid="7745724368696313169">"Lokasi"</item>
+    <item msgid="3459320345690097795">"Dapatkan statistik penggunaan"</item>
+    <item msgid="1312534577834048535">"Redam/nyahredam mikrofon"</item>
+    <item msgid="5906017727368097853">"Media projek"</item>
+    <item msgid="2486614710846178542">"Aktifkan VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Lalai"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif diringkaskan"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Kasual"</item>
-    <item msgid="961716102408512888">"Kursif"</item>
-    <item msgid="784581717183349567">"Huruf besar kecil"</item>
+    <item msgid="7247838127505318669">"Sans-serif monoruang"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monoruang"</item>
+    <item msgid="639503332147461010">"Kasual"</item>
+    <item msgid="7967169925231332424">"Tulisan sambung"</item>
+    <item msgid="561832997193039673">"Huruf besar bersaiz kecil"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Sangat kecil"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K per pnimbal log"</item>
     <item msgid="2822309747675758628">"256K per pnmbal log"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Cache (klien aktiviti)"</item>
     <item msgid="6652164677254579050">"Cache (kosong)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Hijau kebiruan"</item>
+    <item msgid="8332294763632946560">"Biru"</item>
+    <item msgid="2023216417616991392">"Biru nila"</item>
+    <item msgid="3170497246594232819">"Ungu"</item>
+    <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 a7d291f..6f43bbe 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Langsung"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Imbas"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Terperinci"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Paparkan Apl"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Papar Kekuatan WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Sambung kepada rangkaian"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Ingat rangkaian"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan rangkaian"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Mod panggilan Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi-Fi sahaja"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Mati"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi diutamakan (Menggunakan rangkaian selular hanya jika Wi-Fi tidak tersedia)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Selular diutamakan (Menggunakan Wi-Fi hanya jika rangkaian selular tidak tersedia)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi shj (Jgn gunakan rangkaian sel. Tidak boleh membuat atau menerima panggilan jika Wi-Fi tiada)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Status bateri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Aras bateri"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Ini akan menetapkan semula semua tetapan yang berkaitan dengan perangkaian kepada lalai kilang, termasuk:\n\n"<li>"Wi-Fi"</li>\n<li>"Data mudah alih"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Tetapkan semula tetapan"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Tetapkan semula semua tetapan rangkaian? Anda tidak boleh menterbalikkan tindakan ini!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Tetapkan semula tetapan"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Anda perlu melukis corak buka kunci untuk mengesahkan penetapan semula tetapan rangkaian."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tetapkan semula?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tetapan rangkaian sudah 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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"app muat turun aplikasi sistem"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d apl menyediakan keadaan</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Tetapkan semula pilihan merentas semua apl kepada lalai"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apl dipasang, termasuk apl sistem dan apl yang dimuat turun"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-my-rMM-nokeys/strings.xml b/res/values-my-rMM-nokeys/strings.xml
new file mode 100644
index 0000000..70f2bdd
--- /dev/null
+++ b/res/values-my-rMM-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"အပလီကေးရှင်းများကို စီမံကွပ်ကဲရန်"</string>
+</resources>
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my-rMM/arrays.xml
index 5995254..c795c0b 100644
--- a/res/values-my-rMM/arrays.xml
+++ b/res/values-my-rMM/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"သေးငယ်သော"</item>
     <item msgid="1932071435506638315">"ပုံမှန်"</item>
     <item msgid="38373998008112077">"အကြီးစား"</item>
-    <item msgid="7786168277516233536">"အကြီးစား"</item>
+    <item msgid="7786168277516233536">"ဧရာမ"</item>
   </string-array>
   <string-array name="tts_rate_entries">
     <item msgid="6041212618892492920">"အလွန်နှေးသည်"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -136,7 +135,7 @@
     <item msgid="1701505390737218306">"ဆက်သွယ်ထားပြီး"</item>
     <item msgid="3189211552661432651">"ဖိတ်ခေါ်ထားပြီး"</item>
     <item msgid="3206450250360237549">"မအောင်မြင်ပါ"</item>
-    <item msgid="7785896708926971207">"ရရှိနိုင်သည်"</item>
+    <item msgid="7785896708926971207">"ချိတ်ဆက်နိုင်သော"</item>
     <item msgid="2330782789550628803">"စက်ကွင်းပြင်ပ"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"အမြဲတမ်း"</item>
     <item msgid="844721238536786870">"ကြိုးဖြင့်ဆက်ထားသည့်အခါသာ"</item>
-    <item msgid="2990218920631468642">"မည်သည့်အခါမျှ (ဒေတာအသုံးပြုမှုအားတိုးစေသည်)"</item>
+    <item msgid="1986753720941888596">"မည်သည့်အခါမှ"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"အမြဲတမ်း"</item>
     <item msgid="7433294150916905997">"ကြိုးဖြင့်ဆက်ထားသည့်အခါသာ"</item>
     <item msgid="1390404486722375028">"မည်သည့်အခါမှ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"နောက်ဆုံး ရက် ၃၀"</item>
+    <item msgid="6600989128423965319">"သုံးစွဲမှု စက်ဝန်း သတ်မှတ်ရန်..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"အလိုအလျောက်"</item>
+    <item msgid="1013988753804838790">"အလိုအလျောက်"</item>
     <item msgid="6670588712989942178">"၅ GHzသာ"</item>
     <item msgid="2715516524973207876">"၂.၄ GHz သာ"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"အသုံးပြုကြာချိန်"</item>
-    <item msgid="3703676222230317933">"ရေတွက်ရန် ဖွင့်မည်"</item>
+    <item msgid="4796160515314745154">"နောက်ဆုံး အကြိမ် အသုံးပြုခဲ့"</item>
     <item msgid="2502754479975776899">"အပ်ပလီကေးရှင်းအမည်"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"နှိုးစက်သံအတိုးအကျယ်"</item>
     <item msgid="785049718065337473">"အကြောင်းကြားသံအတိုးအကျယ်"</item>
     <item msgid="6700305533746877052">"ဘလူးတုသ်သံအတိုးအကျယ်"</item>
-    <item msgid="3810969981743709839">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
-    <item msgid="2627903914574908209">"ဖွင့်လျက် ထားရှိရန်"</item>
-    <item msgid="1395372654968157578">"တည်နေရာ စောင့်ကြည့်ရန်"</item>
-    <item msgid="3238451051299611853">"စွမ်းအားမြင့် တည်နေရာ စောင့်ကြည့်ရန်"</item>
+    <item msgid="2029227495214047094">"ဖွင့်လျှက်ထားရှိရန်"</item>
+    <item msgid="26109888160231211">"တည်နေရာအား စောင့်ကြည့်စစ်ဆေးရန်"</item>
+    <item msgid="5753382310468855812">"စွမ်းအားမြင့် ဖန်သားပြင် တည်နေရာ"</item>
+    <item msgid="3356591542543137332">"သုံးစွဲမှု စာရင်းအင်းများကို ရယူရန်"</item>
+    <item msgid="3073734345226842233">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
+    <item msgid="1148142988678569310">"ပရိုဂျက် မီဒီယာ"</item>
+    <item msgid="9130014005474445273">"VPN ကို စဖွင့်သုံးရန်"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"တည်နေရာ"</item>
@@ -319,25 +325,29 @@
     <item msgid="7260546305036218513">"နှိုးစက်သံအတိုးအကျယ်"</item>
     <item msgid="9103719301075748925">"အကြောင်းကြားသံအတိုးအကျယ်"</item>
     <item msgid="7025966722295861512">"ဘလူးတုသ်သံအတိုးအကျယ်"</item>
-    <item msgid="2265317984004577529">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
-    <item msgid="3646325683886507917">"ဖွင့်လျက် ထားရှိရန်"</item>
+    <item msgid="4665183401128289653">"ဖွင့်လျှက်ထားရှိရန်"</item>
+    <item msgid="8584357129746649222">"တည်နေရာ"</item>
     <item msgid="7669257279311110599">"တည်နေရာ"</item>
-    <item msgid="7745724368696313169">"တည်နေရာ"</item>
+    <item msgid="3459320345690097795">"သုံးစွဲမှု စာရင်းအင်းများကို ရယူရန်"</item>
+    <item msgid="1312534577834048535">"မိုက်ခရိုဖုန်း အသံတိတ်/မတိတ်ရန်"</item>
+    <item msgid="5906017727368097853">"ပရိုဂျက် မီဒီယာ"</item>
+    <item msgid="2486614710846178542">"VPN ကို စဖွင့်သုံးရန်"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"အတို"</item>
-    <item msgid="2560532955514699713">"အလယ်အလတ်"</item>
+    <item msgid="2560532955514699713">"အတော်အသင့်"</item>
     <item msgid="2372711992605524591">"အရှည်"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="1319652728542138112">"မူလစာလုံး"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"စာလုံးကြီးအသေးစား"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Seri"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Casua"</item>
+    <item msgid="7967169925231332424">"Cursiv"</item>
+    <item msgid="561832997193039673">"စာလုံးကြီး ဆိုဒ်သေးများ"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"အလွန်သေးရန်"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"၆၄K"</item>
+    <item msgid="3534782711045262344">"၂၅၆K"</item>
+    <item msgid="8085867209202153403">"၁M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K လော့ ဘာဖားတွက်"</item>
     <item msgid="2822309747675758628">"256K လော့ ဘာဖားတွက်"</item>
@@ -436,17 +451,17 @@
     <item msgid="1340692776955662664">"glGetError အမှားတက်လျှင်ခေါ်သောလုပ်ငန်းစဉ်"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
-    <item msgid="993742912147090253">"ပိတ်ရန်"</item>
+    <item msgid="993742912147090253">"ပိတ်"</item>
     <item msgid="675719912558941285">"စတုဂံမဟုတ်သော ဖောက်ရန်အပိုင်းကို အပြာရောင်ဖြင့်ဆွဲပါ"</item>
     <item msgid="1064373276095698656">"စမ်းသပ်ထားသော ပုံဆွဲရန်ညွှန်ကြားချက်များကို အစိမ်းရောင်ဖြင့် အသားပေး ဖော်ပြပါ"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"ပိတ်ရန်"</item>
+    <item msgid="2193584639058893150">"ပိတ်"</item>
     <item msgid="2751513398307949636">"ဖန်သားပြင်ပေါ်မှာ မျဉ်းတန်းကဲ့သို့"</item>
     <item msgid="1851438178120770973">"adb shell dumpsys ထဲမှ gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
-    <item msgid="8190572633763871652">"ပိတ်ရန်"</item>
+    <item msgid="8190572633763871652">"ပိတ်"</item>
     <item msgid="7688197031296835369">"ရှိရင်းစွဲထက်ပိုသော ဧရိယာများကိုပြရန်"</item>
     <item msgid="2290859360633824369">"အရောင်ရောနှောသောဧရိယာများပြရန်"</item>
   </string-array>
@@ -481,18 +496,18 @@
   </string-array>
   <string-array name="ram_states">
     <item msgid="7088762389498381203">"ပုံမှန်"</item>
-    <item msgid="4517779899383204000">"အလယ်အလတ်"</item>
+    <item msgid="4517779899383204000">"အတော်အသင့်"</item>
     <item msgid="406385694840950802">"နည်းနေသည်"</item>
     <item msgid="4212263919458209842">"စိုးရိမ်ရသည်"</item>
   </string-array>
   <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"ပိတ်ရန်"</item>
+    <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>
+    <item msgid="866544120205026771">"အတော်အသင့်"</item>
     <item msgid="7851902244436886890">"နိမ့်"</item>
     <item msgid="3022922196817563960">"အရေးပါ"</item>
   </string-array>
@@ -510,6 +525,21 @@
     <item msgid="2860945127596974299">"နောက်ဆုံး သုံးမှု"</item>
     <item msgid="8610560843693675830">"ကက်ရှ လုပ်ထား (အသုံးပြုမှု)"</item>
     <item msgid="4338089220026248848">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
-    <item msgid="6652164677254579050">"ကက်ရှ လုပ်ထား (ပလာ)"</item>
+    <item msgid="6652164677254579050">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
+  </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"စိမ်းပြာ"</item>
+    <item msgid="8332294763632946560">"အပြာ"</item>
+    <item msgid="2023216417616991392">"မဲနယ်"</item>
+    <item msgid="3170497246594232819">"ခရမ်း"</item>
+    <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 b74bd1a..c20ce3c 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"အဆင့်မြင့် ဘလူးတုသ်"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ဘလူးတုသ်ကို ဖွင့်ထားလျှင်၊ သင်၏ ကိရိယာသည် အနီးရှိ အခြား ဘလူးတုသ် ကိရိယာများဖြင့် ဆက်သွယ်နိုင်သည်။"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"တိုက်ရိုက် ဝိုင်ဖိုင်"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"စကင်ပြုလုပ်ခြင်း"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"အဆင့်မြင့်"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Appများကို ပြရန်"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi အားကို ပြရန်"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ကွန်ယက်အား ဆက်သွယ်မည်"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ကွန်ရက် မှတ်သားပါ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ကွန်ရက်အား မေ့ရန်"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"ဝိုင်ဖိုင်ဖြင့် ခေါ်ဆိုသောမုဒ်"</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>
+    <item msgid="3132912693346866895">"ကြိုးမဲ့အင်တာနက် သာလျှင်"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"၂"</item>
+    <item msgid="1171822231056612021">"၁"</item>
+    <item msgid="3194458950573886239">"၀"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ပိတ်ထားရသည်"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ဝိုင်ဖိုင်အား ပိုနှစ်သက်သော (ဝိုင်ဖိုင် မရပါက ဆဲလ်ကွန်ယက်ကိုသာလျှင် သုံးရန်)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ဆယ်လူလာအား ပိုနှစ်သက်သော (ဆဲလ်ကွန်ယက် မရပါက ဝိုင်ဖိုင်ကိုသာလျှင် အသုံးပြုရန်)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"ဝိုင်ဖိုင်သာ (ဆဲလ်ကွန်ယက် လုံးဝမသုံးရန်။ ဝိုင်ဖိုင်မရလျှင် ဖုန်းခေါ်ခြင်း သို့ လက်ခံခြင်းမလုပ်နိုင်)"</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 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ဘက်ထရီအခြေအနေ"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ဘက်ထရီ အားအဆင့်"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"၎င်းသည် ကွန်ရက်နှင့် ပတ်သတ်သော ချိန်ညှိမှုများ အားလုံးကို စက်ရုံမူရင်းသို့ ပြန်လည်သတ်မှတ်ပါလိမ့်မည်၊ ပါဝင်သည်မှာ:\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="1745138973574945389">"ကွန်ရက်ချိန်ညှိချက်များအားလုံးပြန်လည်သတ်မှတ်မည်လား? ဤလုပ်ဆောင်ချက်ကို ပြန်လည်နောက်ပြန်၍ မရပါ!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ရန်"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ကွန်ရက်ချိန်ညှိမှုများ ပြန်လည်သတ်မှတ်ရန် သော့ဖွင့်သည့်ပုံစံကို ဆွဲပြီး အတည်ပြုရန် လိုအပ်သည်။"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"ပြန်လည်စတင်ရန် ပြုလုပ်မလား?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ကွန်ရက် ချိန်ညှိမှုများ ပြန်လည်သတ်မှတ်ရန်"</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>
@@ -1108,6 +1110,8 @@
     <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="788127681455735699">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"သေချာစစ်ဆေးနေပါသည်။"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"သေချာစစ်ဆေးနေပါသည်။"</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>
@@ -1153,7 +1157,7 @@
     <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="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>
@@ -1399,17 +1403,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>
@@ -1448,19 +1441,29 @@
     <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>
@@ -1564,6 +1567,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>
@@ -1705,14 +1709,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>
@@ -1751,7 +1761,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>
@@ -1850,12 +1860,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>
@@ -2027,6 +2035,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>
@@ -2229,13 +2241,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>
@@ -2286,8 +2298,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>
@@ -2352,13 +2364,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>
@@ -2375,6 +2389,9 @@
     <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_all_apps" msgid="5377153522551809915">"app များ ဒေါင်းလုပ်ရယူသော အပ္ပလီကေးရှင်းစနစ်"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"အပ်ဖ်များ ခွင့်ပြုချက်လုံခြုံရေး"</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>
@@ -2419,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">app %d ခုသည် အခြေအနေများကို စီမံပေးသည်</item>
+      <item quantity="one">app %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">"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>
@@ -2515,4 +2534,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"App များအားလုံးရှိ ရွေးချယ်စရာများအား မူလအတိုင်း ပြန်ညှိရန်"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"စနစ် နှင့် ဒေါင်းယူရယူထားသော app များ အပါအဝင်၊ သွင်းယူထားသော app အရေအတွက် <xliff:g id="COUNT">%d</xliff:g>"</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>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 2015b20..942a69a 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Alltid"</item>
     <item msgid="844721238536786870">"Bare når tilkoblet strøm"</item>
-    <item msgid="2990218920631468642">"Aldri (økt databruk)"</item>
+    <item msgid="1986753720941888596">"Aldri"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Alltid"</item>
     <item msgid="7433294150916905997">"Bare når tilkoblet strøm"</item>
     <item msgid="1390404486722375028">"Aldri"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"De siste 30 dagene"</item>
+    <item msgid="6600989128423965319">"Angi brukssyklus"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatisk"</item>
+    <item msgid="1013988753804838790">"Automatisk"</item>
     <item msgid="6670588712989942178">"Kun 5 GHz"</item>
     <item msgid="2715516524973207876">"Kun 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Brukstid"</item>
-    <item msgid="3703676222230317933">"Start telling"</item>
+    <item msgid="4796160515314745154">"Sist brukt"</item>
     <item msgid="2502754479975776899">"Navn på app"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarmvolum"</item>
     <item msgid="785049718065337473">"varselvolum"</item>
     <item msgid="6700305533746877052">"bluetooth-volum"</item>
-    <item msgid="3810969981743709839">"slå mikrofonen av eller på"</item>
-    <item msgid="2627903914574908209">"behold aktiv"</item>
-    <item msgid="1395372654968157578">"overvåk posisjon"</item>
-    <item msgid="3238451051299611853">"overvåk posisjon med høyt strømforbruk"</item>
+    <item msgid="2029227495214047094">"hold aktiv"</item>
+    <item msgid="26109888160231211">"overvåk posisjon"</item>
+    <item msgid="5753382310468855812">"overvåk plassering med høyt strømforbruk"</item>
+    <item msgid="3356591542543137332">"få bruksstatistikk"</item>
+    <item msgid="3073734345226842233">"slå mikrofonen av eller på"</item>
+    <item msgid="1148142988678569310">"projiser media"</item>
+    <item msgid="9130014005474445273">"aktivér VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Sted"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarmvolum"</item>
     <item msgid="9103719301075748925">"Varselvolum"</item>
     <item msgid="7025966722295861512">"Bluetooth-volum"</item>
-    <item msgid="2265317984004577529">"Slå mikrofonen av eller på"</item>
-    <item msgid="3646325683886507917">"Hold aktiv"</item>
+    <item msgid="4665183401128289653">"Hold aktiv"</item>
+    <item msgid="8584357129746649222">"Posisjon"</item>
     <item msgid="7669257279311110599">"Sted"</item>
-    <item msgid="7745724368696313169">"Posisjon"</item>
+    <item msgid="3459320345690097795">"Få bruksstatistikk"</item>
+    <item msgid="1312534577834048535">"Slå mikrofonen av eller på"</item>
+    <item msgid="5906017727368097853">"Projiser media"</item>
+    <item msgid="2486614710846178542">"Aktivér VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Standard"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Kondensert sans-serif"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Uformelt"</item>
-    <item msgid="961716102408512888">"Kursiv"</item>
-    <item msgid="784581717183349567">"Små forbokstaver"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Uformell"</item>
+    <item msgid="7967169925231332424">"Kursiv"</item>
+    <item msgid="561832997193039673">"Små forbokstaver"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Veldig liten"</item>
@@ -375,6 +385,11 @@
     <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 000"</item>
+    <item msgid="3534782711045262344">"256 000"</item>
+    <item msgid="8085867209202153403">"1 million"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64 kB pr loggbuffer"</item>
     <item msgid="2822309747675758628">"256 kB pr buffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Bufret (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Bufret (tom)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blågrønn"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lilla"</item>
+    <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 f47e072..d3814dd 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skann"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansert"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Vis apper"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Vis Wi-Fi-styrken"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Husk nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-ringemodus"</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>
+    <item msgid="3132912693346866895">"Bare Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Av"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi er foretrukket (bruker Wi-Fi bare hvis mobilnettverk ikke er tilgjengelig)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobilnettverk er foretrukket (bruker Wi-Fi bare hvis mobilnettverk ikke er tilgjengelig)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Bare Wi-Fi (Bruker aldri mobilnettverk. Kan ikke ringe eller motta anrop hvis Wi-Fi ikke er tilgjengelig)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Dette tilbakestiller alle nettverksinnstillingene til fabrikkinnstillingene, 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Du må tegne opplåsingsmønsteret for å bekrefte tilbakestilling av nettverksinnstillingene."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vil du tilbakestille?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"apper last ned apper system"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"sikkerhet for apptillatelser"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d apper angir betingelser</item>
+      <item quantity="one">%d app 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Tilbakestill innstillingene for alle apper til standardinnstillingene"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apper er installert, inkludert systemapper og nedlastede apper"</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>
 </resources>
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne-rNP/arrays.xml
index a65ee75..d175da7 100644
--- a/res/values-ne-rNP/arrays.xml
+++ b/res/values-ne-rNP/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"सधैं"</item>
     <item msgid="844721238536786870">"प्लग इन भएपछि मात्र"</item>
-    <item msgid="2990218920631468642">"कहिल्यै नहुने (डेटा उपयोग बढ्छ)"</item>
+    <item msgid="1986753720941888596">"कहिल्यै पनि होइन"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"सधैँ"</item>
     <item msgid="7433294150916905997">"केवल प्लग गरेको बेलामा मात्र"</item>
     <item msgid="1390404486722375028">"कहिल्यै पनि होइन"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"अन्तिम ३० दिन"</item>
+    <item msgid="6600989128423965319">"प्रयोग चक्र सेट..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"स्वतः"</item>
+    <item msgid="1013988753804838790">"स्वचालित"</item>
     <item msgid="6670588712989942178">"५ GHz मात्र"</item>
     <item msgid="2715516524973207876">"२.४ GHz मात्र"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"उपयोग समय"</item>
-    <item msgid="3703676222230317933">"गणना सुरु गर्नुहोस्"</item>
+    <item msgid="4796160515314745154">"पछिल्लो समय प्रयोग गरिएको"</item>
     <item msgid="2502754479975776899">"अनुप्रयोगको नाम"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"अलार्म मात्रा"</item>
     <item msgid="785049718065337473">"सूचना मात्रा"</item>
     <item msgid="6700305533746877052">"ब्लुटुथ मात्रा"</item>
-    <item msgid="3810969981743709839">"माइक्रोफोनको आवाज बन्द/खुला गर्नुहोस्"</item>
-    <item msgid="2627903914574908209">"ननिदाउनुहोस्"</item>
-    <item msgid="1395372654968157578">"स्थानको निरीक्षण गर्नुहोस्"</item>
-    <item msgid="3238451051299611853">"उच्च शक्ति स्थान निरीक्षण गर्नुहोस्"</item>
+    <item msgid="2029227495214047094">"जागा रहनुहोस्"</item>
+    <item msgid="26109888160231211">"स्थानको निरीक्षण गर्नुहोस्"</item>
+    <item msgid="5753382310468855812">"उच्च शक्ति स्थान मनिटर"</item>
+    <item msgid="3356591542543137332">"तथ्याङ्क उपयोग प्राप्त गर्नुहोस्"</item>
+    <item msgid="3073734345226842233">"माइक्रोफोनको आवाज बन्द/खुला गर्नुहोस्"</item>
+    <item msgid="1148142988678569310">"परियोजना मिडिया"</item>
+    <item msgid="9130014005474445273">"VPN सक्रिय पार्नुहोस्"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"स्थान"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"आलर्म मात्रा"</item>
     <item msgid="9103719301075748925">"सूचना भोल्युम"</item>
     <item msgid="7025966722295861512">"ब्लुटुथ भोल्युम"</item>
-    <item msgid="2265317984004577529">"माइक्रोफोनको आवाज बन्द्/खुला गर्नुहोस्"</item>
-    <item msgid="3646325683886507917">"ननिदाउनुहोस्"</item>
+    <item msgid="4665183401128289653">"जागा रहनुहोस्"</item>
+    <item msgid="8584357129746649222">"स्थान"</item>
     <item msgid="7669257279311110599">"स्थान"</item>
-    <item msgid="7745724368696313169">"स्थान"</item>
+    <item msgid="3459320345690097795">"तथ्याङ्क उपयोग प्राप्त गर्नुहोस्"</item>
+    <item msgid="1312534577834048535">"माइक्रोफोनको आवाज बन्द्/खुला गर्नुहोस्"</item>
+    <item msgid="5906017727368097853">"आयोजना मिडिया"</item>
+    <item msgid="2486614710846178542">"VPN सक्रिय पार्नुहोस्"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"छोटो"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"पूर्वनिर्धारित"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"आरामदायक"</item>
-    <item msgid="961716102408512888">"घसीट"</item>
-    <item msgid="784581717183349567">"लघु दीर्घाक्षर"</item>
+    <item msgid="7247838127505318669">"सन्स-सेरिफ मोनोस्पेस"</item>
+    <item msgid="4478414822462359763">"सेरिफ"</item>
+    <item msgid="7502451783483660829">"सेरिफ मोनोस्पेस"</item>
+    <item msgid="639503332147461010">"आरामदायक"</item>
+    <item msgid="7967169925231332424">"जोडिएको लेखाइ"</item>
+    <item msgid="561832997193039673">"लघु दीर्घाक्षर"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"ज्यादै साना"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"६४K"</item>
+    <item msgid="3534782711045262344">"२५६K"</item>
+    <item msgid="8085867209202153403">"१ मेगा पिक्सेल"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K प्रति लग बफर"</item>
     <item msgid="2822309747675758628">"256K प्रति लग बफर"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"क्यास (गतिविधि ग्राहक)"</item>
     <item msgid="6652164677254579050">"क्यास (खाली)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"टिल"</item>
+    <item msgid="8332294763632946560">"नीलो"</item>
+    <item msgid="2023216417616991392">"इन्डिगो"</item>
+    <item msgid="3170497246594232819">"बैजनी"</item>
+    <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 d5d2520..51e9f76 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ठीक छ"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"जटिल ब्लुटुथ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ब्लुटुथ खोलेको बेला तपाईँको उपकरणले नजिकैका अन्य ब्लुटुथ उपकरणहरूसँग संचार गर्न सक्छन्।"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"वाइफाइ प्रत्यक्ष"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्क्यान"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"जटिल"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"अनुप्रयोगहरु देखाउनुहोस्"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"वाइफाइ शक्ति देखाउनुहोस्"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्कमा जोड्नुहोस्"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"सञ्जाल सम्झनुहोस्"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"सञ्जाल बिर्सनुहोस्"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi कलिङ मोड"</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>
+    <item msgid="3132912693346866895">"Wi-Fi मात्र"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"बन्द गर्नुहोस्"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi को सुझाव गरियो (Wi-Fi उपलब्ध नहुँदा मात्र सेल सञ्जालको प्रयोग गर्दछ)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"सेलुलरको सुझाव गरियो (सेल सञ्जाल उपलब्ध नहुँदा मात्र Wi-Fi को प्रयोग गर्दछ)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"ब्याट्रि स्थिति"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ब्याट्रि स्तर"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"यसले \n\n"<li>"Wifi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li>" सहितका सबै नेटवर्किङ सम्बन्धित सेटिङहरूलाई कारखाना पूर्वनिर्धारितहरूमा रिसेट गर्नेछ"</string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"सेटिङहरू रिसेट गर्नुहोस्"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"सबै सञ्जाल सेटिङहरू रिसेट गर्ने हो? तपाईँ यस कार्यलाई उल्टाउन सक्नुहुन्न!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"सेटिङहरू रिसेट गर्नुहोस्"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"तपाईंले एक सञ्जाल सेटिङहरू रिसेट गर्न पुष्टिको निम्ति तपाईँले आफ्नो अनलक ढाँचा कोर्न आवश्यक छ"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"रिसेट गर्ने हो?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"सञ्जाल सेटिङहरू रिसेट"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"स्थान निर्धारण गर्न GPS प्रयोग गर्नुहोस्"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"स्क्यान गर्दै"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"स्क्यान गर्दै"</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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"अनुप्रयोगहरू डाउनलोड गर्ने अनुप्रयोग प्रणाली"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"अनुप्रयोगहरू अनुमति सुरक्षा"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other"> %d अनुप्रयोगले सर्तहरू प्रदान गर्छ</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"सबै अनुप्रयोगहरूभरि प्राथमिकताहरू पूर्वनिर्धारितमा रिसेट गर्नुहोस्"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"प्रणाली र डाउनलोड गरिएका अनुप्रयोगहरूसहित <xliff:g id="COUNT">%d</xliff:g> अनुप्रयोगहरू स्थापना गरिए"</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>
 </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 6802731..891864d 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Altijd"</item>
     <item msgid="844721238536786870">"Alleen indien aangesloten"</item>
-    <item msgid="2990218920631468642">"Nooit (verhoogt het gegevensgebruik)"</item>
+    <item msgid="1986753720941888596">"Nooit"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Altijd"</item>
     <item msgid="7433294150916905997">"Alleen indien aangesloten"</item>
     <item msgid="1390404486722375028">"Nooit"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Afgelopen 30 dagen"</item>
+    <item msgid="6600989128423965319">"Gebruikscyclus instellen…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatisch"</item>
+    <item msgid="1013988753804838790">"Automatisch"</item>
     <item msgid="6670588712989942178">"Alleen 5 GHz"</item>
     <item msgid="2715516524973207876">"Alleen 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Gebruikstijd"</item>
-    <item msgid="3703676222230317933">"Aantal keer gestart"</item>
+    <item msgid="4796160515314745154">"Laatst gebruikt"</item>
     <item msgid="2502754479975776899">"App-naam"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarmvolume"</item>
     <item msgid="785049718065337473">"meldingsvolume"</item>
     <item msgid="6700305533746877052">"bluetooth-volume"</item>
-    <item msgid="3810969981743709839">"microfoon dempen/dempen opheffen"</item>
-    <item msgid="2627903914574908209">"ingeschakeld houden"</item>
-    <item msgid="1395372654968157578">"monitorlocatie"</item>
-    <item msgid="3238451051299611853">"locatie met hoog energieverbruik controleren"</item>
+    <item msgid="2029227495214047094">"ingeschakeld houden"</item>
+    <item msgid="26109888160231211">"monitorlocatie"</item>
+    <item msgid="5753382310468855812">"locatie met hoog energieverbruik controleren"</item>
+    <item msgid="3356591542543137332">"gebruiksstatistieken ophalen"</item>
+    <item msgid="3073734345226842233">"microfoon dempen/dempen opheffen"</item>
+    <item msgid="1148142988678569310">"media projecteren"</item>
+    <item msgid="9130014005474445273">"VPN activeren"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locatie"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarmvolume"</item>
     <item msgid="9103719301075748925">"Meldingsvolume"</item>
     <item msgid="7025966722295861512">"Bluetooth-volume"</item>
-    <item msgid="2265317984004577529">"Microfoon dempen/dempen opheffen"</item>
-    <item msgid="3646325683886507917">"Ingeschakeld houden"</item>
+    <item msgid="4665183401128289653">"Ingeschakeld houden"</item>
+    <item msgid="8584357129746649222">"Locatie"</item>
     <item msgid="7669257279311110599">"Locatie"</item>
-    <item msgid="7745724368696313169">"Locatie"</item>
+    <item msgid="3459320345690097795">"Gebruiksstatistieken ophalen"</item>
+    <item msgid="1312534577834048535">"Microfoon dempen/dempen opheffen"</item>
+    <item msgid="5906017727368097853">"Media projecteren"</item>
+    <item msgid="2486614710846178542">"VPN activeren"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Standaard"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif versmald"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual games"</item>
-    <item msgid="961716102408512888">"Cursief"</item>
-    <item msgid="784581717183349567">"Kleine kapitalen"</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">"Cursief"</item>
+    <item msgid="561832997193039673">"Kleine kapitalen"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Zeer klein"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K per logbuffer"</item>
     <item msgid="2822309747675758628">"256K per logbuffer"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Gecacht (activiteitsclient)"</item>
     <item msgid="6652164677254579050">"Gecacht (leeg)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blauwgroen"</item>
+    <item msgid="8332294763632946560">"Blauw"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Paars"</item>
+    <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 1b4e640..a8609fa 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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 vliegtuigmodus"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan niet scannen naar netwerken"</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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wifi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scannen"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Geavanceerd"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Apps weergeven"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Wifi-sterkte weergvn"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Netwerk onthouden"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netwerk vergeten"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modus voor bellen via wifi"</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>
+    <item msgid="3132912693346866895">"Alleen wifi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Uit"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Voorkeur voor wifi (mobiel netwerk wordt alleen gebruikt als er geen wifi beschikbaar is)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Voorkeur voor mobiel (wifi wordt alleen gebruikt als er geen mobiel netwerk beschikbaar is)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Alleen wifi (mobiel netwerk wordt nooit gebruikt; kan niet bellen of gebeld worden als er geen wifi beschikbaar is)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Accuniveau"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Hiermee worden de standaardwaarden van alle instellingen met betrekking tot netwerken hersteld, 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="1745138973574945389">"Alle netwerkinstellingen herstellen? U kunt deze actie niet ongedaan maken."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Instellingen herstellen"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"U moet uw ontgrendelingspatroon tekenen om het herstellen van de netwerkinstellingen te bevestigen."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Herstellen?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Netwerkinstellingen herstellen"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"apps downloaden applicaties systeem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"apps rechten beveiliging"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d apps leveren voorwaarden</item>
+      <item quantity="one">%d app levert 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Standaardwaarden van voorkeuren voor alle apps herstellen"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps geïnstalleerd, inclusief systeemapps en gedownloade apps"</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>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index fbc3104..a00322b 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Zawsze"</item>
     <item msgid="844721238536786870">"Tylko, gdy podłączony"</item>
-    <item msgid="2990218920631468642">"Nigdy (zwiększa użycie danych)"</item>
+    <item msgid="1986753720941888596">"Nigdy"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Zawsze"</item>
     <item msgid="7433294150916905997">"Tylko, gdy podłączony"</item>
     <item msgid="1390404486722375028">"Nigdy"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Ostatnie 30 dni"</item>
+    <item msgid="6600989128423965319">"Ustaw cykl danych..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatyczna"</item>
+    <item msgid="1013988753804838790">"Automatyczne"</item>
     <item msgid="6670588712989942178">"Tylko 5 GHz"</item>
     <item msgid="2715516524973207876">"Tylko 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Czas użycia"</item>
-    <item msgid="3703676222230317933">"Licznik uruchomień"</item>
+    <item msgid="4796160515314745154">"Ostatnie użycie"</item>
     <item msgid="2502754479975776899">"Nazwa aplikacji"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -195,7 +198,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">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"głośność alarmu"</item>
     <item msgid="785049718065337473">"głośność powiadomień"</item>
     <item msgid="6700305533746877052">"głośność Bluetooth"</item>
-    <item msgid="3810969981743709839">"wyciszenie/anulowanie wyciszenia mikrofonu"</item>
-    <item msgid="2627903914574908209">"utrzymanie aktywności"</item>
-    <item msgid="1395372654968157578">"monitorowanie lokalizacji"</item>
-    <item msgid="3238451051299611853">"monitorowanie zwiększonego zużycia energii w związku z lokalizacją"</item>
+    <item msgid="2029227495214047094">"utrzymanie aktywności"</item>
+    <item msgid="26109888160231211">"monitorowanie lokalizacji"</item>
+    <item msgid="5753382310468855812">"monitor wysoki zasilanie lokalizacja"</item>
+    <item msgid="3356591542543137332">"pobierz statystyki użycia"</item>
+    <item msgid="3073734345226842233">"wycisz mikrofon/wyłącz wyciszenie"</item>
+    <item msgid="1148142988678569310">"wyświetl multimedia"</item>
+    <item msgid="9130014005474445273">"aktywuj VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokalizacja"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Głośność alarmu"</item>
     <item msgid="9103719301075748925">"Głośność powiadomień"</item>
     <item msgid="7025966722295861512">"Głośność Bluetooth"</item>
-    <item msgid="2265317984004577529">"Wyciszenie/anulowanie wyciszenia mikrofonu"</item>
-    <item msgid="3646325683886507917">"Utrzymanie aktywności"</item>
+    <item msgid="4665183401128289653">"Utrzymanie aktywności"</item>
+    <item msgid="8584357129746649222">"Lokalizacja"</item>
     <item msgid="7669257279311110599">"Lokalizacja"</item>
-    <item msgid="7745724368696313169">"Lokalizacja"</item>
+    <item msgid="3459320345690097795">"Pobierz statystyki użycia"</item>
+    <item msgid="1312534577834048535">"Wycisz mikrofon/wyłącz wyciszenie"</item>
+    <item msgid="5906017727368097853">"Wyświetl multimedia"</item>
+    <item msgid="2486614710846178542">"Aktywuj VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Domyślna"</item>
     <item msgid="1016452621833735880">"Bezszeryfowa"</item>
     <item msgid="2496277987934654454">"Bezszeryfowa wąska"</item>
-    <item msgid="4406003087391086325">"Szeryfowa"</item>
-    <item msgid="1558362802170124073">"Równej szerokości"</item>
-    <item msgid="6857338041963571301">"Zwykłe"</item>
-    <item msgid="961716102408512888">"Kursywa"</item>
-    <item msgid="784581717183349567">"Kapitaliki"</item>
+    <item msgid="7247838127505318669">"Bezszeryfowy o stałej szerokości"</item>
+    <item msgid="4478414822462359763">"Szeryfowy"</item>
+    <item msgid="7502451783483660829">"Szeryfowy o stałej szerokości"</item>
+    <item msgid="639503332147461010">"Zwykły"</item>
+    <item msgid="7967169925231332424">"Kursywa"</item>
+    <item msgid="561832997193039673">"Kapitaliki"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Bardzo mały"</item>
@@ -375,6 +385,11 @@
     <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/bufor dziennika"</item>
     <item msgid="2822309747675758628">"256 K/bufor dziennika"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Pamięć podręczna (klient aktywności)"</item>
     <item msgid="6652164677254579050">"Pamięć podręczna (pusta)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Morski"</item>
+    <item msgid="8332294763632946560">"Niebieski"</item>
+    <item msgid="2023216417616991392">"Indygo"</item>
+    <item msgid="3170497246594232819">"Fioletowy"</item>
+    <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 26a5872..92786ea 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>
@@ -137,16 +139,7 @@
     <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>
@@ -156,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>
@@ -327,9 +320,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>
@@ -350,6 +340,32 @@
     <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>
@@ -393,8 +409,6 @@
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth – zaawansowane"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Po włączeniu Bluetootha urządzenie może komunikować się z innymi urządzeniami Bluetooth w pobliżu."</string>
     <string name="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>
@@ -539,28 +548,15 @@
     <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">"Prześlij ekran"</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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanuj"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Zaawansowane"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Pokaż aplikacje"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Pokaż moc Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamiętaj sieć"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zapomnij sieć"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="wifi_calling_settings_title" msgid="4102921303993404577">"Połączenia przez Wi-Fi"</string>
+    <string name="wifi_calling_mode_title" msgid="3208568886184788972">"Tryb połączeń przez Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Tylko Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Wył."</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Preferuj sieć Wi-Fi (używa sieci komórkowej tylko wtedy, gdy sieć Wi-Fi jest niedostępna)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Preferuj sieć komórkową (używa Wi-Fi tylko wtedy, gdy sieć komórkowa jest niedostępna)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Tylko Wi-Fi (nie używa sieci komórkowej – bez Wi-Fi nie można wykonywać ani odbierać połączeń)"</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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Poziom naładowania baterii"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"Spowoduje to zresetowanie do ustawień fabrycznych wszystkich opcji dotyczących sieci, 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Musisz narysować wzór odblokowania, by potwierdzić zresetowanie ustawień sieciowych."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Zresetować?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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_accounts" product="default" msgid="6412857499147999073">\n\n"Zalogowano się na konta:\n"</string>
@@ -1107,6 +1127,8 @@
     <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_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>
@@ -1152,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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."</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ś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>
@@ -1563,6 +1584,7 @@
     <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>
@@ -1704,14 +1726,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>
@@ -1750,7 +1778,7 @@
     <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>
@@ -1849,12 +1877,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="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>
@@ -2026,6 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_all_apps" msgid="5377153522551809915">"aplikacje pobrane systemowe"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"zabezpieczenia uprawnień 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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="few">Warunki dostarczają %d aplikacje</item>
+      <item quantity="many">Warunki dostarcza %d aplikacji</item>
+      <item quantity="other">Warunki dostarcza %d aplikacji</item>
+      <item quantity="one">Warunki dostarcza %d aplikacja</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">"Pokazuj powiadomienia na górze listy i zezwalaj 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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Zresetuj ustawienia wszystkich aplikacji do wartości domyślnych"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Zainstalowane aplikacje: <xliff:g id="COUNT">%d</xliff:g>, w tym systemowe i pobrane"</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>
 </resources>
diff --git a/res/values-pt-nokeys/strings.xml b/res/values-pt-nokeys/strings.xml
index 96d62c0..15c52f4 100644
--- a/res/values-pt-nokeys/strings.xml
+++ b/res/values-pt-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">"Gerenciar aplicativos"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Gerenciar apps"</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 3ec7032..fd68a42 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
     <item msgid="844721238536786870">"Apenas quando estiver ligado"</item>
-    <item msgid="2990218920631468642">"Nunca (aumenta a utilização de dados)"</item>
+    <item msgid="1986753720941888596">"Nunca"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
     <item msgid="7433294150916905997">"Apenas quando estiver ligado"</item>
     <item msgid="1390404486722375028">"Nunca"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Últimos 30 dias"</item>
+    <item msgid="6600989128423965319">"Def. ciclo utilização..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automático"</item>
+    <item msgid="1013988753804838790">"Automático"</item>
     <item msgid="6670588712989942178">"Apenas 5 GHz"</item>
     <item msgid="2715516524973207876">"Apenas 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Tempo de utilização"</item>
-    <item msgid="3703676222230317933">"Total de inícios"</item>
+    <item msgid="4796160515314745154">"Última utilização"</item>
     <item msgid="2502754479975776899">"Nome da aplicação"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume de alarme"</item>
     <item msgid="785049718065337473">"volume de notificação"</item>
     <item msgid="6700305533746877052">"volume de Bluetooth"</item>
-    <item msgid="3810969981743709839">"desativar/ativar o som do microfone"</item>
-    <item msgid="2627903914574908209">"manter ativo"</item>
-    <item msgid="1395372654968157578">"monitorizar a localização"</item>
-    <item msgid="3238451051299611853">"monitorizar a localização de potência elevada"</item>
+    <item msgid="2029227495214047094">"Manter ativo"</item>
+    <item msgid="26109888160231211">"monitorizar localização"</item>
+    <item msgid="5753382310468855812">"monitorizar localização de potência elevada"</item>
+    <item msgid="3356591542543137332">"obter estatísticas de utilização"</item>
+    <item msgid="3073734345226842233">"desativar/reativar o som do microfone"</item>
+    <item msgid="1148142988678569310">"projetar multimédia"</item>
+    <item msgid="9130014005474445273">"ativar VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Localização"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume do alarme"</item>
     <item msgid="9103719301075748925">"Volume de notificações"</item>
     <item msgid="7025966722295861512">"Volume de Bluetooth"</item>
-    <item msgid="2265317984004577529">"Desativar/ativar o som do microfone"</item>
-    <item msgid="3646325683886507917">"Manter ativo"</item>
+    <item msgid="4665183401128289653">"Manter ativo"</item>
+    <item msgid="8584357129746649222">"Localização"</item>
     <item msgid="7669257279311110599">"Localização"</item>
-    <item msgid="7745724368696313169">"Localização"</item>
+    <item msgid="3459320345690097795">"Obter estatísticas de utilização"</item>
+    <item msgid="1312534577834048535">"Desativar/reativar o som do microfone"</item>
+    <item msgid="5906017727368097853">"Projetar multimédia"</item>
+    <item msgid="2486614710846178542">"Ativar VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predefinição"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensado"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monoespaço"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursivo"</item>
-    <item msgid="784581717183349567">"Maiúsculas pequenas"</item>
+    <item msgid="7247838127505318669">"Monoespaço Sans-serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Monoespaço Serif"</item>
+    <item msgid="639503332147461010">"Ocasionais"</item>
+    <item msgid="7967169925231332424">"Cursivo"</item>
+    <item msgid="561832997193039673">"Maiúsculas pequenas"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Muito pequeno"</item>
@@ -375,6 +385,11 @@
     <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">"Mem. int. 64K p rg."</item>
     <item msgid="2822309747675758628">"Mem. int. 256K p rg"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Em cache (cliente de atividade)"</item>
     <item msgid="6652164677254579050">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Azul esverdeado"</item>
+    <item msgid="8332294763632946560">"Azul"</item>
+    <item msgid="2023216417616991392">"Índigo"</item>
+    <item msgid="3170497246594232819">"Roxo"</item>
+    <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 c5b5f44..d18d7d5 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth Avançado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Quando o Bluetooth está ativado, o disp. pode comunicar com outros disp. Bluetooth próximos."</string>
     <string name="bluetooth_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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Procurar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançadas"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar aplicações"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar força Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Memorizar a rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modo de chamada Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Apenas Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desativado"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Rede Wi-Fi preferida (utiliza apenas a rede celular se o Wi-Fi não estiver disponível)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Rede móvel preferida (utiliza Wi-Fi apenas se a rede celular não estiver disponível)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Apenas Wi-Fi (nunca utiliza rede celular. N/ pode fazer/receber chamadas se Wi-Fi não estiver disp.)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Esta ação repõe as predefinições de fábrica de todas as definições relacionadas com a 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="1745138973574945389">"Pretende repor todas as definições de rede? Não é possível reverter esta ação!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Repor definições"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"É necessário desenhar a sequência de desbloqueio para confirmar uma reposição de definições de rede."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Pretende repor?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Reposição das definições de rede"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d aplicações fornecem condições</item>
+      <item quantity="one">%d aplicação fornece 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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Repor as predefinições das preferências para todas as aplicações"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> aplicações instaladas, incluindo aplicações do sistema e transferidas"</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>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index bba96c2..8d6f1b5 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,22 +153,26 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Sempre"</item>
     <item msgid="844721238536786870">"Somente quando conectado"</item>
-    <item msgid="2990218920631468642">"Nunca (aumenta o uso de dados)"</item>
+    <item msgid="1986753720941888596">"Nunca"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Sempre"</item>
     <item msgid="7433294150916905997">"Somente quando conectado"</item>
     <item msgid="1390404486722375028">"Nunca"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Últimos 30 dias"</item>
+    <item msgid="6600989128423965319">"Definir ciclo de uso..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automático"</item>
+    <item msgid="1013988753804838790">"Automático"</item>
     <item msgid="6670588712989942178">"Apenas 5 GHz"</item>
     <item msgid="2715516524973207876">"Apenas 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Tempo de uso"</item>
-    <item msgid="3703676222230317933">"Iniciar contagem"</item>
-    <item msgid="2502754479975776899">"Nome do aplicativo"</item>
+    <item msgid="4796160515314745154">"Última utilização"</item>
+    <item msgid="2502754479975776899">"Nome do app"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume do alarme"</item>
     <item msgid="785049718065337473">"volume da notificação"</item>
     <item msgid="6700305533746877052">"volume do Bluetooth"</item>
-    <item msgid="3810969981743709839">"ativar/desativar o som do microfone"</item>
-    <item msgid="2627903914574908209">"permanecer ativo"</item>
-    <item msgid="1395372654968157578">"monitorar local"</item>
-    <item msgid="3238451051299611853">"monitorar local de alta potência"</item>
+    <item msgid="2029227495214047094">"permanecer ativo"</item>
+    <item msgid="26109888160231211">"monitorar local"</item>
+    <item msgid="5753382310468855812">"monitorar local de alta potência"</item>
+    <item msgid="3356591542543137332">"obter estatísticas de uso"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Local"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume do alarme"</item>
     <item msgid="9103719301075748925">"Volume da notificação"</item>
     <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
-    <item msgid="2265317984004577529">"Ativar/desativar o som do microfone"</item>
-    <item msgid="3646325683886507917">"Permanecer ativo"</item>
+    <item msgid="4665183401128289653">"Permanecer ativo"</item>
+    <item msgid="8584357129746649222">"Local"</item>
     <item msgid="7669257279311110599">"Local"</item>
-    <item msgid="7745724368696313169">"Local"</item>
+    <item msgid="3459320345690097795">"Obter estatísticas de uso"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Padrão"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensado"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Espaçamento uniforme"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursiva"</item>
-    <item msgid="784581717183349567">"Maiúsculas pequenas"</item>
+    <item msgid="7247838127505318669">"Sans-serif monoespaçada"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monoespaçada"</item>
+    <item msgid="639503332147461010">"Casual"</item>
+    <item msgid="7967169925231332424">"Cursiva"</item>
+    <item msgid="561832997193039673">"Versalete"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Muito pequeno"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Usar padrões do aplicativo"</item>
+    <item msgid="7009918361545506251">"Usar padrões do app"</item>
     <item msgid="1770533843436933500">"Branco em preto"</item>
     <item msgid="758587126802411846">"Preto em branco"</item>
     <item msgid="1495307195241623402">"Amarelo em preto"</item>
@@ -375,6 +385,11 @@
     <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">"64K/buffer de log"</item>
     <item msgid="2822309747675758628">"256K/buffer de log"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Em cache (cliente de atividade)"</item>
     <item msgid="6652164677254579050">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Azul-petróleo"</item>
+    <item msgid="8332294763632946560">"Azul"</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 3f6e93f..71eda8d 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,30 @@
     <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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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">"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_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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Verificar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançado"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Mostrar apps"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Mostrar força Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Lembrar da rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer a rede"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Modo de chamada por Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Somente Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Desativado"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi preferido: usa a rede celular apenas se o Wi-Fi não está disponível"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Celular preferido: usa o Wi-Fi apenas se a rede celular não está disponível"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi apenas: nunca usa rede celular. Não faz nem recebe chamadas se o Wi-Fi não está disponível"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nível da bateria"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Isso redefinirá todas as configurações relacionadas à rede para os padrões de originais, 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">"Redefinir configurações"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Redefinir todas as configurações de rede? Não é possível reverter essa ação."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Redefinir configurações"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a redefinição das configurações de rede."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Redefinir?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Configurações de rede 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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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">"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 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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d apps fornecem condições</item>
+      <item quantity="other">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Redefinir preferências em todos os apps para o padrão"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> apps instalados, incluindo o sistema e apps baixados"</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>
 </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 b2a9f59..98b92a9 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -147,29 +146,33 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Slab"</item>
-    <item msgid="5615082285463430971">"Corect"</item>
+    <item msgid="5615082285463430971">"Acceptabil"</item>
     <item msgid="3565079809875324621">"Bun"</item>
     <item msgid="5702329417707689835">"Excelent"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Întotdeauna"</item>
     <item msgid="844721238536786870">"Doar atunci când este conectat"</item>
-    <item msgid="2990218920631468642">"Niciodată (măreşte utilizarea datelor)"</item>
+    <item msgid="1986753720941888596">"Niciodată"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Întotdeauna"</item>
     <item msgid="7433294150916905997">"Doar atunci când este conectat"</item>
     <item msgid="1390404486722375028">"Niciodată"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Ultimele 30 de zile"</item>
+    <item msgid="6600989128423965319">"Setați ciclu utilizare..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automat"</item>
+    <item msgid="1013988753804838790">"Automat"</item>
     <item msgid="6670588712989942178">"Numai pe 5 GHz"</item>
     <item msgid="2715516524973207876">"Numai pe 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Durată de utilizare"</item>
-    <item msgid="3703676222230317933">"Numărul lansărilor"</item>
-    <item msgid="2502754479975776899">"Numele aplicaţiei"</item>
+    <item msgid="4796160515314745154">"Ultima utilizare"</item>
+    <item msgid="2502754479975776899">"Numele aplicației"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volum alarmă"</item>
     <item msgid="785049718065337473">"volum notificări"</item>
     <item msgid="6700305533746877052">"volumul Bluetooth"</item>
-    <item msgid="3810969981743709839">"activează/dezactivează microfonul"</item>
-    <item msgid="2627903914574908209">"menține starea activă"</item>
-    <item msgid="1395372654968157578">"monitorizează locația"</item>
-    <item msgid="3238451051299611853">"monitorizează solicitările de localizare care necesită consum ridicat de energie"</item>
+    <item msgid="2029227495214047094">"mențineți activ"</item>
+    <item msgid="26109888160231211">"monitorizarea locației"</item>
+    <item msgid="5753382310468855812">"monitorizarea localizării cu consum ridicat de energie"</item>
+    <item msgid="3356591542543137332">"obțineți statistici de utilizare"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Locație"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volum alarmă"</item>
     <item msgid="9103719301075748925">"Volum notificări"</item>
     <item msgid="7025966722295861512">"Volum Bluetooth"</item>
-    <item msgid="2265317984004577529">"Activează/dezactivează microfonul"</item>
-    <item msgid="3646325683886507917">"Menține starea activă"</item>
+    <item msgid="4665183401128289653">"Păstrare în activitate"</item>
+    <item msgid="8584357129746649222">"Locație"</item>
     <item msgid="7669257279311110599">"Locație"</item>
-    <item msgid="7745724368696313169">"Locație"</item>
+    <item msgid="3459320345690097795">"Obțineți statistici de utilizare"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Prestabilit"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif condensat"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Cu un singur spațiu"</item>
-    <item msgid="6857338041963571301">"Familiar"</item>
-    <item msgid="961716102408512888">"Cursiv"</item>
-    <item msgid="784581717183349567">"Majuscule mici"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Obișnuit"</item>
+    <item msgid="7967169925231332424">"Cursiv"</item>
+    <item msgid="561832997193039673">"Majuscule mici"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Foarte mic"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</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">"64K/tampon jurnal"</item>
     <item msgid="2822309747675758628">"256K/tampon jurnal"</item>
@@ -427,7 +442,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>
@@ -462,9 +477,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>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"În cache (client de activitate)"</item>
     <item msgid="6652164677254579050">"În cache (gol)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Turcoaz"</item>
+    <item msgid="8332294763632946560">"Albastru"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Violet"</item>
+    <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 71f6bc2..35a9f2d 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +319,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>
@@ -350,6 +339,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>
@@ -393,8 +407,6 @@
     <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>
@@ -405,7 +417,6 @@
     <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>
@@ -429,30 +440,36 @@
     <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>
@@ -482,15 +499,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>
@@ -518,15 +528,6 @@
     <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="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>
@@ -539,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_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>
@@ -595,15 +583,11 @@
     <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>
@@ -626,6 +610,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scanaţi"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avansate"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Afișați aplicații"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Afișați semnal Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectaţi-vă la reţea"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Rețineți rețeaua"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Eliminaţi reţeaua"</string>
@@ -641,7 +627,7 @@
     <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>
@@ -667,20 +653,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>
@@ -753,6 +734,23 @@
     <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="3208568886184788972">"Modul Apelare prin Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Numai Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Dezactivată"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Se preferă Wi-Fi (Folosește rețeaua mobilă numai când conexiunea Wi-Fi nu e disponibilă)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Se preferă conexiunea mobilă (Folosește Wi-Fi numai când rețeaua mobilă nu e disponibilă)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Numai Wi-Fi (Nu folosește niciodată rețeaua mobilă. Nu se pot efectua sau primi apeluri fără Wi-Fi)"</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>
@@ -816,6 +814,11 @@
     <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>
@@ -867,10 +870,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>
@@ -964,7 +968,8 @@
     <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_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="battery_status_title" msgid="9159414319574976203">"Stare baterie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivelul bateriei"</string>
@@ -1009,10 +1014,16 @@
     <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="5805796658276223307">"Astfel, toate setările legate de conectarea la rețele vor reveni la valorile prestabilite din fabrică, 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="1745138973574945389">"Resetați toate setările de rețea? Această acțiune este ireversibilă!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetați setările"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Pentru a confirma resetarea setărilor de rețea trebuie să desenați modelul de deblocare."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetați?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Resetarea setărilor de rețea"</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_accounts" product="default" msgid="6412857499147999073">\n\n"În prezent sunteţi conectat(ă) la următoarele conturi:\n"</string>
@@ -1107,6 +1118,8 @@
     <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="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_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>
@@ -1152,7 +1165,7 @@
     <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="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>
@@ -1399,17 +1412,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>
@@ -1448,19 +1450,29 @@
     <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_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>
@@ -1564,6 +1576,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>
@@ -1705,14 +1718,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>
@@ -1751,7 +1770,7 @@
     <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>
@@ -1850,12 +1869,10 @@
     <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="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>
@@ -2027,6 +2044,10 @@
     <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>
@@ -2229,13 +2250,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>
@@ -2286,8 +2307,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>
@@ -2352,13 +2373,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>
@@ -2375,6 +2398,9 @@
     <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_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_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>
@@ -2419,29 +2445,33 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="few">%d aplicații oferă condiții</item>
+      <item quantity="other">%d de aplicații oferă condiții</item>
+      <item quantity="one">%d aplicație oferă 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>
@@ -2515,4 +2545,38 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Resetați preferințele pentru toate aplicațiile la valorile prestabilite"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> (de) aplicații instalate, inclusiv aplicațiile de sistem și descărcate"</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>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index edf0161..0935119 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>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Не выключать"</item>
     <item msgid="844721238536786870">"Только при питании от сети"</item>
-    <item msgid="2990218920631468642">"Всегда выключать (увеличивает объем моб. трафика)"</item>
+    <item msgid="1986753720941888596">"Всегда выключать"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Не выключать"</item>
     <item msgid="7433294150916905997">"Только при питании от сети"</item>
     <item msgid="1390404486722375028">"Всегда выключать"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"За последние 30 дней"</item>
+    <item msgid="6600989128423965319">"Цикл использования данных"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Авто"</item>
+    <item msgid="1013988753804838790">"Автоматически"</item>
     <item msgid="6670588712989942178">"Только 5 ГГц"</item>
     <item msgid="2715516524973207876">"Только 2,4 ГГц"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Время использования"</item>
-    <item msgid="3703676222230317933">"Подсчитать"</item>
+    <item msgid="4796160515314745154">"Последнее использование"</item>
     <item msgid="2502754479975776899">"Название приложения"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"громкость будильника"</item>
     <item msgid="785049718065337473">"громкость уведомлений"</item>
     <item msgid="6700305533746877052">"громкость Bluetooth-устройств"</item>
-    <item msgid="3810969981743709839">"включить/отключить микрофон"</item>
-    <item msgid="2627903914574908209">"не отключать"</item>
-    <item msgid="1395372654968157578">"отслеживать местоположение"</item>
-    <item msgid="3238451051299611853">"контролировать использование заряда батареи при определении местоположения"</item>
+    <item msgid="2029227495214047094">"не отключать"</item>
+    <item msgid="26109888160231211">"Отслеживать местоположение"</item>
+    <item msgid="5753382310468855812">"контролировать использование энергии при определении местоположения"</item>
+    <item msgid="3356591542543137332">"посмотреть статистику использования"</item>
+    <item msgid="3073734345226842233">"включить/отключить микрофон"</item>
+    <item msgid="1148142988678569310">"трансляция контента"</item>
+    <item msgid="9130014005474445273">"активация VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Местоположение"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Громкость будильника"</item>
     <item msgid="9103719301075748925">"Громкость уведомлений"</item>
     <item msgid="7025966722295861512">"Громкость Bluetooth-устройств"</item>
-    <item msgid="2265317984004577529">"Включить/отключить микрофон"</item>
-    <item msgid="3646325683886507917">"Не отключать"</item>
+    <item msgid="4665183401128289653">"Не отключать"</item>
+    <item msgid="8584357129746649222">"Местоположение"</item>
     <item msgid="7669257279311110599">"Определение местоположения"</item>
-    <item msgid="7745724368696313169">"Местоположение"</item>
+    <item msgid="3459320345690097795">"Посмотреть статистику использования"</item>
+    <item msgid="1312534577834048535">"Включить/отключить микрофон"</item>
+    <item msgid="5906017727368097853">"Трансляция контента"</item>
+    <item msgid="2486614710846178542">"Активация VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"По умолчанию"</item>
     <item msgid="1016452621833735880">"Без засечек"</item>
     <item msgid="2496277987934654454">"Без засечек, сжатый"</item>
-    <item msgid="4406003087391086325">"С засечками"</item>
-    <item msgid="1558362802170124073">"Моноширинный"</item>
-    <item msgid="6857338041963571301">"Обычный"</item>
-    <item msgid="961716102408512888">"Курсив"</item>
-    <item msgid="784581717183349567">"Малые прописные"</item>
+    <item msgid="7247838127505318669">"Без засечек, моноширинный"</item>
+    <item msgid="4478414822462359763">"С засечками"</item>
+    <item msgid="7502451783483660829">"C засечками, моноширинный"</item>
+    <item msgid="639503332147461010">"Обычный"</item>
+    <item msgid="7967169925231332424">"Курсив"</item>
+    <item msgid="561832997193039673">"Капитель"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Очень мелкий"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 МБ"</item>
     <item msgid="3025431211013424097">"16 МБ"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 КБ"</item>
+    <item msgid="3534782711045262344">"256 КБ"</item>
+    <item msgid="8085867209202153403">"1 МБ"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"Буфер: макс. 64 КБ"</item>
     <item msgid="2822309747675758628">"Буфер: макс. 256 КБ"</item>
@@ -459,7 +474,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>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кешировано (клиент)"</item>
     <item msgid="6652164677254579050">"Кешировано (пусто)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Сине-зеленый"</item>
+    <item msgid="8332294763632946560">"Синий"</item>
+    <item msgid="2023216417616991392">"Индиго"</item>
+    <item msgid="3170497246594232819">"Фиолетовый"</item>
+    <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 7b2284a..9ad66bd 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>
@@ -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">"Подключено (кроме 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>
@@ -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."</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>
@@ -327,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>
@@ -350,6 +340,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>
@@ -393,8 +409,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>
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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_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>
@@ -518,15 +536,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Расш. настройки Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Включите Bluetooth, чтобы подключаться к другим Bluetooth-устройствам."</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>
@@ -539,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"</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>
@@ -595,15 +591,11 @@
     <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_select_assistant_dialog_title" msgid="4014645210955009439">"Выбор ассистента Wi-Fi"</string>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Поиск"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Дополнительные функции"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Показывать приложения"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Показывать уровень сигнала Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Сохранить сеть"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Удалить эту сеть"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"Звонки по Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Только Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Отключено"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Приоритет у Wi-Fi (использовать мобильную сеть, только если сети Wi-Fi недоступны)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Приоритет у моб. сети (использовать Wi-Fi, только если мобильная сеть недоступна)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Только 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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Уровень заряда батареи"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"На устройстве будут восстановлены заводские сетевые настройки, в том числе для:\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="1745138973574945389">"Восстановить сетевые настройки будет невозможно. Продолжить?"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Да"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Чтобы подтвердить сброс, начертите графический ключ."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Сбросить настройки?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Настройки сброшены"</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>
@@ -1107,6 +1127,8 @@
     <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_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>
@@ -1152,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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 +1726,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>
@@ -1750,7 +1778,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>
@@ -1849,12 +1877,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 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,10 @@
     <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_all_apps" msgid="5377153522551809915">"приложения скачать установить система"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2454,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d приложение задает условия</item>
+      <item quantity="few">%d приложения задают условия</item>
+      <item quantity="many">%d приложений задают условия</item>
+      <item quantity="other">%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>
@@ -2514,4 +2556,42 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Восстановить настройки по умолчанию для всех приложений"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Всего приложений: <xliff:g id="COUNT">%d</xliff:g> (включая системные и установленные пользователем)"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Дополнительные настройки"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"Неизвестное приложение"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"Выберите профиль"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si-rLK/arrays.xml
index bbd5147..c859e62 100644
--- a/res/values-si-rLK/arrays.xml
+++ b/res/values-si-rLK/arrays.xml
@@ -89,7 +89,7 @@
     <item msgid="8513729475867537913">"සම්බන්ධ වෙමින්…"</item>
     <item msgid="515055375277271756">"සත්‍යාපනය වෙමින්…"</item>
     <item msgid="1943354004029184381">"IP ලිපිනය ලබාගනිමින්…"</item>
-    <item msgid="4221763391123233270">"සම්බන්ධිත"</item>
+    <item msgid="4221763391123233270">"සම්බන්ධිතයි"</item>
     <item msgid="624838831631122137">"අත්හිටුවන ලදි"</item>
     <item msgid="7979680559596111948">"විසන්ධි වෙමින්…"</item>
     <item msgid="1634960474403853625">"විසන්ධි වුණි"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -133,7 +132,7 @@
     <item msgid="5366790421523328066">"මෙම උපකරණයේ සිට PIN"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
-    <item msgid="1701505390737218306">"සම්බන්ධිත"</item>
+    <item msgid="1701505390737218306">"සම්බන්ධිතයි"</item>
     <item msgid="3189211552661432651">"ආරාධිත"</item>
     <item msgid="3206450250360237549">"අසාර්ථකයි"</item>
     <item msgid="7785896708926971207">"ලබා ගත හැකියි"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"සැමවිටම"</item>
     <item msgid="844721238536786870">"පේනුව ගත කළ විට පමණක්"</item>
-    <item msgid="2990218920631468642">"කිසි දිනෙක එපා (දත්ත භාවිතය වැඩි කරන්න)"</item>
+    <item msgid="1986753720941888596">"කවදාවත් නොවේ"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"සැමවිටම"</item>
     <item msgid="7433294150916905997">"පේනුව සක්‍රිය කලවිට පමණක්"</item>
     <item msgid="1390404486722375028">"කවදාවත් නොවේ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"අවසන් දින 30"</item>
+    <item msgid="6600989128423965319">"භාවිත කිරීමේ කවය සකසන්න..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"ස්වයංක්‍රීය"</item>
+    <item msgid="1013988753804838790">"ස්වයංක්‍රිය"</item>
     <item msgid="6670588712989942178">"5 GHz පමණි"</item>
     <item msgid="2715516524973207876">"2.4 GHz පමණි"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"භාවිතා කාලය"</item>
-    <item msgid="3703676222230317933">"දියත් කිරීම් ගණන"</item>
+    <item msgid="4796160515314745154">"අවසන් වරට භාවිත කළේ"</item>
     <item msgid="2502754479975776899">"යෙදුමේ නම"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"සීනුවේ ශබ්දය"</item>
     <item msgid="785049718065337473">"දැනුම්දීමේ ශබ්දය"</item>
     <item msgid="6700305533746877052">"බ්ලූටූත් ශබ්දය"</item>
-    <item msgid="3810969981743709839">"නිශ්ශබ්ද/නිශ්ශබ්ද නැති මයික්‍රෝෆෝනය"</item>
-    <item msgid="2627903914574908209">"අවදිව සිටින්න"</item>
-    <item msgid="1395372654968157578">"නිරීක්ෂණ ස්ථානය"</item>
-    <item msgid="3238451051299611853">"වැඩි බල ස්ථානය නිරීක්ෂණය"</item>
+    <item msgid="2029227495214047094">"අවදිව සිටින්න"</item>
+    <item msgid="26109888160231211">"නිරීක්ෂණ ස්ථානය"</item>
+    <item msgid="5753382310468855812">"වැඩි බල ස්ථානය නිරීක්ෂණය"</item>
+    <item msgid="3356591542543137332">"භාවිත කිරීමේ තත්ත්ව ලබාගන්න"</item>
+    <item msgid="3073734345226842233">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
+    <item msgid="1148142988678569310">"මාධ්‍ය ව්‍යාපෘතිය"</item>
+    <item msgid="9130014005474445273">"VPN සක්‍රිය කරන්න"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ස්ථානය"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"සීනුවේ ශබ්දය"</item>
     <item msgid="9103719301075748925">"දැනුම්දීමේ ශබ්දය"</item>
     <item msgid="7025966722295861512">"බ්ලූටූත් ශබ්දය"</item>
-    <item msgid="2265317984004577529">"නිශ්ශබ්ද/නිශ්ශබ්ද නැති මයික්‍රෝෆෝනය"</item>
-    <item msgid="3646325683886507917">"අවදිව සිටින්න"</item>
+    <item msgid="4665183401128289653">"අවදිව සිටින්න"</item>
+    <item msgid="8584357129746649222">"ස්ථානය"</item>
     <item msgid="7669257279311110599">"ස්ථානය"</item>
-    <item msgid="7745724368696313169">"ස්ථානය"</item>
+    <item msgid="3459320345690097795">"භාවිත කිරීමේ තත්ත්ව ලබාගන්න"</item>
+    <item msgid="1312534577834048535">"මයික්‍රෝෆෝනය නිශ්ශබ්ද/නිශ්ශබ්ද නැති කරන්න"</item>
+    <item msgid="5906017727368097853">"මාධ්‍ය ව්‍යාපෘතිය"</item>
+    <item msgid="2486614710846178542">"VPN සක්‍රිය කරන්න"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"කොට"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"සුපුරුදු"</item>
     <item msgid="1016452621833735880">"සෑන්ස්-සේරිෆ්"</item>
     <item msgid="2496277987934654454">"සෑන්ස්-සේරිෆ් කන්ඩෙන්ස්ඩ්"</item>
-    <item msgid="4406003087391086325">"සේරිෆ්"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"සාමාන්‍ය"</item>
-    <item msgid="961716102408512888">"බැඳි අකුරුමය"</item>
-    <item msgid="784581717183349567">"කුඩා ලොකු අකුරු"</item>
+    <item msgid="7247838127505318669">"සැන්ස්-සේරිෆ් මොනෝස්පේස්"</item>
+    <item msgid="4478414822462359763">"සේරිෆ්"</item>
+    <item msgid="7502451783483660829">"සේරිෆ් මොනෝස්පේස්"</item>
+    <item msgid="639503332147461010">"සාමාන්‍ය"</item>
+    <item msgid="7967169925231332424">"බැඳි අකුරුමය"</item>
+    <item msgid="561832997193039673">"කුඩා ලොකු අකුරු"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"ඉතා කුඩා"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"ලොග අන්තරාවකට 64K"</item>
     <item msgid="2822309747675758628">"ලොග අන්තරාවකට 256K"</item>
@@ -441,12 +456,12 @@
     <item msgid="1064373276095698656">"පරික්ෂා කරන ලද ඇඳීමේ විධාන කොළ පැහැයෙන් ඉස්මතු කරන්න"</item>
   </string-array>
   <string-array name="track_frame_time_entries">
-    <item msgid="2193584639058893150">"අක්‍රිය කරන්න"</item>
+    <item msgid="2193584639058893150">"අක්‍රියයි"</item>
     <item msgid="2751513398307949636">"තිරයෙහි පටි ලෙස"</item>
     <item msgid="1851438178120770973">"Adb shell dumpsys gfxinfo තුළ"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
-    <item msgid="8190572633763871652">"අක්‍රිය කරන්න"</item>
+    <item msgid="8190572633763871652">"අක්‍රියයි"</item>
     <item msgid="7688197031296835369">"වැඩිකොට දක්වනවා ඇති ප්‍රදේශ පෙන්වන්න"</item>
     <item msgid="2290859360633824369">"අපවිෂවීම සඳහා ප්‍රදේශ පෙන්වන්න"</item>
   </string-array>
@@ -470,7 +485,7 @@
     <item msgid="8621078286418985762">"විසන්ධි විය"</item>
     <item msgid="6692305604213080515">"මුල පුරමින්…"</item>
     <item msgid="8001704909356800092">"සම්බන්ධ වෙමින්…"</item>
-    <item msgid="4039737283841672166">"සම්බන්ධිත"</item>
+    <item msgid="4039737283841672166">"සම්බන්ධිතයි"</item>
     <item msgid="4042143101664725090">"කල් ඉකුත්වීම"</item>
     <item msgid="7664124146786465092">"අසාර්ථකයි"</item>
   </string-array>
@@ -486,7 +501,7 @@
     <item msgid="4212263919458209842">"අවදානම්"</item>
   </string-array>
   <string-array name="entries_zen_mode">
-    <item msgid="816404936744485190">"අක්‍රිය කරන්න"</item>
+    <item msgid="816404936744485190">"අක්‍රියයි"</item>
     <item msgid="5656544177755411222">"සීමා කළ අතුරු බිදුම්"</item>
     <item msgid="8735337502532332056">"ශූන්‍ය අතුරු බිදුම්"</item>
   </string-array>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"හැඹිලි ගත කළ (ක්‍රියාකාරකම් සේවාලාභියා)"</item>
     <item msgid="6652164677254579050">"හැඹිලි ගත කළ (හිස්)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"සේරා"</item>
+    <item msgid="8332294763632946560">"නිල්"</item>
+    <item msgid="2023216417616991392">"ඉන්ඩිගෝ"</item>
+    <item msgid="3170497246594232819">"දම්"</item>
+    <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 f2daab8..9d6cf8f 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>
@@ -137,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>
@@ -156,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>
@@ -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="TRUST_AGENT_NAME">%2$s</xliff:g> විසින් අගුළු හැර ඇති විට හැර, <xliff:g id="TIMEOUT_STRING">%1$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="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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"දියුණු බ්ලූටූත්"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"බ්ලූටූත් සබල විට, ඔබගේ උපාංගයට අවට ඇති බ්ලූටූත් උපාංග සමඟ සන්නිවේදනය කළ හැක."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"ඍජු Wi-Fi"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"පරිලෝකනය කරන්න"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"උසස්"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"යෙදුම පෙන්වන්න"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi බලය පෙන්වන්න"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ජාලයට සම්බන්ධ කරන්න"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"ජාලය මතක තබාගන්න"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ජාලය අමතක කරන්න"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi ඇමතුම් මෝඩය"</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>
+    <item msgid="3132912693346866895">"Wi-Fi පමණයි"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ක්‍රියාවිරහිතයි"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi වඩා කැමතියි (Wi-Fi නොමැති නම් පමණක් සෙලියුලර් ජාලය භාවිතා කරයි)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"සෙලියුලර් වඩා කැමතියි (සෙලියුලර් ජාලය නොමැති නම් පමණක් Wi-Fi භාවිතා කරයි)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"බැටරි තත්වය"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"බැටරි මට්ටම"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"මෙය පහත ඒවා ඇතුළුව, කර්මාන්තශාලා පෙරනිමි වෙත ජාලකරණයට සම්බන්ධ සියලු සැකසීම් යළි පිහිටවනු ඇත:\n\n"<li>"Wifi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"සැකසීම් යළි පිහිටුවන ලදි"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"සියලු ජාල සැකසීම් යළි පිහිටුවන්නද? ඔබට මෙම ක්‍රියාව ආපසු හැරවිය නොහැකිය!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"සැකසීම් යළි පිහිටුවන්න"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"ජාල සැකසීම් යළි පිහිටුවීමක් තහවුරු කිරීමට ඔබ ඔබේ අගුලු හැරීමේ රටාව ඇඳීමට අවශ්‍යයි."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"යළි පිහිටුවන්නද?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</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>
@@ -1109,6 +1111,8 @@
     <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_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>
@@ -1154,7 +1158,7 @@
     <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="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>
@@ -1400,17 +1404,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>
@@ -1449,19 +1442,29 @@
     <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>
@@ -1565,6 +1568,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>
@@ -1706,14 +1710,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>
@@ -1752,7 +1762,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>
@@ -1851,12 +1861,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 +2036,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>
@@ -2230,13 +2242,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>
@@ -2287,8 +2299,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 +2365,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>
@@ -2376,6 +2390,9 @@
     <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_all_apps" msgid="5377153522551809915">"යෙදුම් බාගැනීම යෙදුම් පද්ධති"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"යෙදුම් අවසර ආරක්ෂාව"</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>
@@ -2420,29 +2437,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">යෙදුම් %d ක් සපයන කොන්දේසි</item>
+      <item quantity="other">යෙදුම් %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>
@@ -2516,4 +2535,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"සියලු යෙදුම් අතර මනාප සුපුරුදු වෙතට යළි පිහිටුවන්න"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"පද්ධති සහ බාගත් යෙදුම් ඇතුළත්ව, යෙදුම් <xliff:g id="COUNT">%d</xliff:g> ක් ස්ථාපනය කර ඇත"</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>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index ed6303e..9fcd06d 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -33,7 +33,7 @@
     <item msgid="3342301044271143016">"15 sekúnd"</item>
     <item msgid="8881760709354815449">"30 sekúnd"</item>
     <item msgid="7589406073232279088">"1 minúta"</item>
-    <item msgid="7001195990902244174">"2 min."</item>
+    <item msgid="7001195990902244174">"2 minúty"</item>
     <item msgid="7489864775127957179">"5 minút"</item>
     <item msgid="2314124409517439288">"10 minút"</item>
     <item msgid="6864027152847611413">"30 minút"</item>
@@ -53,8 +53,8 @@
     <item msgid="6736512735606834431">"5 sekúnd"</item>
     <item msgid="8044619388267891375">"15 sekúnd"</item>
     <item msgid="1822002388249545488">"30 sekúnd"</item>
-    <item msgid="8538071621211916519">"1 min."</item>
-    <item msgid="5663439580228932882">"2 min."</item>
+    <item msgid="8538071621211916519">"1 minúta"</item>
+    <item msgid="5663439580228932882">"2 minúty"</item>
     <item msgid="49888496216106852">"5 minút"</item>
     <item msgid="9002737361305019353">"10 minút"</item>
     <item msgid="4322676235684793329">"30 minút"</item>
@@ -88,7 +88,7 @@
     <item msgid="8934131797783724664">"Prebieha vyhľadávanie..."</item>
     <item msgid="8513729475867537913">"Prebieha pripájanie…"</item>
     <item msgid="515055375277271756">"Prebieha overovanie…"</item>
-    <item msgid="1943354004029184381">"Prebieha načítanie adresy IP…"</item>
+    <item msgid="1943354004029184381">"Získava sa adresa IP…"</item>
     <item msgid="4221763391123233270">"Pripojené"</item>
     <item msgid="624838831631122137">"Pozastavená"</item>
     <item msgid="7979680559596111948">"Prebieha odpájanie..."</item>
@@ -102,7 +102,7 @@
     <item msgid="8878186979715711006">"Prebieha vyhľadávanie..."</item>
     <item msgid="355508996603873860">"Prebieha pripájanie k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="554971459996405634">"Prebieha overovanie v sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
-    <item msgid="7928343808033020343">"Prebieha získavanie adresy IP zo siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Získava sa adresa IP zo siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="8937994881315223448">"Pripojené k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"Pozastavená"</item>
     <item msgid="7698638434317271902">"Prebieha odpájanie od siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Vždy"</item>
     <item msgid="844721238536786870">"Iba počas napájania"</item>
-    <item msgid="2990218920631468642">"Nikdy (zvyšuje používanie dát)"</item>
+    <item msgid="1986753720941888596">"Nikdy"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Vždy"</item>
     <item msgid="7433294150916905997">"Iba počas napájania"</item>
     <item msgid="1390404486722375028">"Nikdy"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Posledných 30 dní"</item>
+    <item msgid="6600989128423965319">"Nastaviť cyklus využitia"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Auto"</item>
+    <item msgid="1013988753804838790">"Automaticky"</item>
     <item msgid="6670588712989942178">"Iba 5 GHz"</item>
     <item msgid="2715516524973207876">"Iba 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Doba použitia"</item>
-    <item msgid="3703676222230317933">"Počet spustení"</item>
+    <item msgid="4796160515314745154">"Naposledy použité"</item>
     <item msgid="2502754479975776899">"Názov aplikácie"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -270,13 +273,16 @@
     <item msgid="7136963238377062018">"hlasitosť hlasu"</item>
     <item msgid="4270236897655923007">"hlasitosť zvonenia"</item>
     <item msgid="6325739889222559394">"hlasitosť médií"</item>
-    <item msgid="5762123934816216821">"hlasitosť budíka"</item>
+    <item msgid="5762123934816216821">"hlasitosť budíkov"</item>
     <item msgid="785049718065337473">"hlasitosť upozornení"</item>
     <item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
-    <item msgid="3810969981743709839">"stlmenie alebo zrušenie stlmenia mikrofónu"</item>
-    <item msgid="2627903914574908209">"zakázanie režimu spánku"</item>
-    <item msgid="1395372654968157578">"sledovanie polohy"</item>
-    <item msgid="3238451051299611853">"sledovanie polohy s vysokým výkonnom"</item>
+    <item msgid="2029227495214047094">"zakázať režim spánku"</item>
+    <item msgid="26109888160231211">"sledovať polohu"</item>
+    <item msgid="5753382310468855812">"sledovanie polohy s vysokým výkonnom"</item>
+    <item msgid="3356591542543137332">"získanie štatistiky používania"</item>
+    <item msgid="3073734345226842233">"stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+    <item msgid="1148142988678569310">"projekcia médií"</item>
+    <item msgid="9130014005474445273">"aktivovať VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Poloha"</item>
@@ -316,13 +322,16 @@
     <item msgid="5660213838861789350">"Hlasitosť hlasu"</item>
     <item msgid="7983336752371254444">"Hlasitosť zvonenia"</item>
     <item msgid="7878027809189330917">"Hlasitosť médií"</item>
-    <item msgid="7260546305036218513">"Hlasitosť budíka"</item>
+    <item msgid="7260546305036218513">"Hlasitosť budíkov"</item>
     <item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
     <item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
-    <item msgid="2265317984004577529">"Stlmenie alebo zrušenie stlmenia mikrofónu"</item>
-    <item msgid="3646325683886507917">"Zakázanie režimu spánku"</item>
+    <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
+    <item msgid="8584357129746649222">"Poloha"</item>
     <item msgid="7669257279311110599">"Poloha"</item>
-    <item msgid="7745724368696313169">"Poloha"</item>
+    <item msgid="3459320345690097795">"Získanie štatistiky využívania"</item>
+    <item msgid="1312534577834048535">"Stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+    <item msgid="5906017727368097853">"Projekcia médií"</item>
+    <item msgid="2486614710846178542">"Aktivovať VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Predvolené"</item>
     <item msgid="1016452621833735880">"Bezpätkové"</item>
     <item msgid="2496277987934654454">"Bezpätkové zhustené"</item>
-    <item msgid="4406003087391086325">"Pätkové"</item>
-    <item msgid="1558362802170124073">"Neproporcionálne"</item>
-    <item msgid="6857338041963571301">"Neformálne"</item>
-    <item msgid="961716102408512888">"Kurzíva"</item>
-    <item msgid="784581717183349567">"Kapitálky"</item>
+    <item msgid="7247838127505318669">"Bezpätkové neproporcionálne"</item>
+    <item msgid="4478414822462359763">"Pätkové"</item>
+    <item msgid="7502451783483660829">"Pätkové neproporcionálne"</item>
+    <item msgid="639503332147461010">"Štandardné"</item>
+    <item msgid="7967169925231332424">"Kurzíva"</item>
+    <item msgid="561832997193039673">"Kapitálky"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Veľmi malé"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 kB na vyrovn. pamäť denníka"</item>
     <item msgid="2822309747675758628">"256 kB na vyrovn. pamäť denníka"</item>
@@ -487,8 +502,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"Vypnuté"</item>
-    <item msgid="5656544177755411222">"Obmedzený počet prerušení"</item>
-    <item msgid="8735337502532332056">"Žiadne prerušenia"</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>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
     <item msgid="6652164677254579050">"Vo vyrovnávacej pamäti (prázdne)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Modrozelená"</item>
+    <item msgid="8332294763632946560">"Modrá"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Purpurová"</item>
+    <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 7f9764f..cd8752c 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +320,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>
@@ -350,6 +340,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>
@@ -393,8 +409,6 @@
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Zobraziť aplikácie"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Zobraziť silu Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Pripojiť k sieti"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapamätať sieť"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť záznam siete"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"Režim volania cez Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Len Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Vypnutý"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Uprednostňuje sa Wi-Fi (ak je Wi-Fi nedostupná, použije sa mobilná sieť)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Uprednostňuje sa mobilné pripojenie (Wi-Fi sa použije iba vtedy, keď bude mobilná sieť nedostupná)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Iba Wi-Fi (Mob. sieť sa nepoužije nikdy. Ak je Wi-Fi nedostupná, nedajú sa hovory prijímať ani uskutočňovať)"</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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Stav batérie"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Stav batérie"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"Týmto obnovíte všetky predvolené továrenské nastavenia súvisiace s možnosťami siete, ako aj s \n\n"<li>"pripojením Wi-Fi"</li>",\n"<li>"mobilným pripojením"</li>" a \n"<li>"pripojením cez Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Obnoviť nastavenia"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Chcete obnoviť všetky nastavenia siete? Túto 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_gesture_explanation" msgid="8615374120762720549">"Obnovenie nastavení siete musíte potvrdiť nakreslením bezpečnostného vzoru."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Obnoviť?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Obnoviť nastavenia siete"</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>
@@ -1107,6 +1127,8 @@
     <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="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_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>
@@ -1152,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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>
@@ -1704,14 +1726,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>
@@ -1750,7 +1778,7 @@
     <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>
@@ -1849,12 +1877,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>
@@ -2026,6 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_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_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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="few">%d aplikácie poskytujú podmienky</item>
+      <item quantity="many">%d aplikácie poskytuje podmienky</item>
+      <item quantity="other">%d aplikácií poskytuje podmienky</item>
+      <item quantity="one">%d aplikácia poskytuje podmienky</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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Resetujete predvolené hodnoty vo všetkých aplikáciách"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Boli nainštalované aplikácie vrátane systémových a stiahnutých aplikácií (počet: <xliff:g id="COUNT">%d</xliff:g>)"</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>
 </resources>
diff --git a/res/values-sl-nokeys/strings.xml b/res/values-sl-nokeys/strings.xml
index 49e27e3..4f73cd7 100644
--- a/res/values-sl-nokeys/strings.xml
+++ b/res/values-sl-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">"Upravljanje programov"</string>
+    <string name="applications_settings_summary" msgid="6616938758022986257">"Upravljanje aplikacij"</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 257e376..c4de9e1 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,22 +153,26 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Vedno"</item>
     <item msgid="844721238536786870">"Samo, ko je priključen"</item>
-    <item msgid="2990218920631468642">"Nikoli (poveča uporabo podatkov)"</item>
+    <item msgid="1986753720941888596">"Nikoli"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Vedno"</item>
     <item msgid="7433294150916905997">"Samo, ko je priključen"</item>
     <item msgid="1390404486722375028">"Nikoli"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Zadnjih 30 dni"</item>
+    <item msgid="6600989128423965319">"Nastav. cikla porabe ..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Samodejno"</item>
+    <item msgid="1013988753804838790">"Samodejno"</item>
     <item msgid="6670588712989942178">"Samo 5 GHz"</item>
     <item msgid="2715516524973207876">"Samo 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Čas uporabe"</item>
-    <item msgid="3703676222230317933">"Število zagonov"</item>
-    <item msgid="2502754479975776899">"Ime programa"</item>
+    <item msgid="4796160515314745154">"Zadnjič uporabljeno"</item>
+    <item msgid="2502754479975776899">"Ime aplikacije"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
     <item msgid="8615575908717909498">"PEAP"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"glasnost alarma"</item>
     <item msgid="785049718065337473">"glasnost obvestila"</item>
     <item msgid="6700305533746877052">"glasnost za Bluetooth"</item>
-    <item msgid="3810969981743709839">"izklop/vklop mikrofona"</item>
-    <item msgid="2627903914574908209">"ohranjanje odklenjenega zaslona"</item>
-    <item msgid="1395372654968157578">"nadzor lokacije"</item>
-    <item msgid="3238451051299611853">"nadzor natančno določene lokacije"</item>
+    <item msgid="2029227495214047094">"ohrani odklenjen zaslon"</item>
+    <item msgid="26109888160231211">"spremljanje lokacije"</item>
+    <item msgid="5753382310468855812">"nadzor natančno določene lokacije"</item>
+    <item msgid="3356591542543137332">"pridobivanje statističnih podatkov o uporabi"</item>
+    <item msgid="3073734345226842233">"izklop/vklop mikrofona"</item>
+    <item msgid="1148142988678569310">"predstavnost projektov"</item>
+    <item msgid="9130014005474445273">"aktiviranje omrežja VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokacija"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Glasnost alarma"</item>
     <item msgid="9103719301075748925">"Glasnost obvestila"</item>
     <item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
-    <item msgid="2265317984004577529">"Izklop/vklop mikrofona"</item>
-    <item msgid="3646325683886507917">"Ohranjanje odklenjenega zaslona"</item>
+    <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
+    <item msgid="8584357129746649222">"Lokacija"</item>
     <item msgid="7669257279311110599">"Lokacija"</item>
-    <item msgid="7745724368696313169">"Lokacija"</item>
+    <item msgid="3459320345690097795">"Pridobivanje statističnih podatkov o uporabi"</item>
+    <item msgid="1312534577834048535">"Izklop/vklop mikrofona"</item>
+    <item msgid="5906017727368097853">"Predstavnost projektov"</item>
+    <item msgid="2486614710846178542">"Aktiviranje omrežja VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Privzeto"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif, zgoščena"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Stalna širina"</item>
-    <item msgid="6857338041963571301">"Vsakdanje"</item>
-    <item msgid="961716102408512888">"Ležeče"</item>
-    <item msgid="784581717183349567">"Pomanjšane velike črke"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Vsakdanje"</item>
+    <item msgid="7967169925231332424">"Ležeče"</item>
+    <item msgid="561832997193039673">"Pomanjšane velike črke"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Zelo majhna"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100 %"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Uporabi privzeto nastavitev aplik."</item>
+    <item msgid="7009918361545506251">"Uporabi privzeto"</item>
     <item msgid="1770533843436933500">"Belo na črnem"</item>
     <item msgid="758587126802411846">"Črno na belem"</item>
     <item msgid="1495307195241623402">"Rumeno na črnem"</item>
@@ -375,6 +385,11 @@
     <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/medpom. dnevn."</item>
     <item msgid="2822309747675758628">"256 K/medpom. dnev."</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Predpomnjeno (odjemalec dejavnosti)"</item>
     <item msgid="6652164677254579050">"Predpomnjeno (prazno)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Zelenomodra"</item>
+    <item msgid="8332294763632946560">"Modra"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Vijolična"</item>
+    <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 0226f4c..227d9e4 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +320,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>
@@ -350,6 +340,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>
@@ -393,8 +409,6 @@
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Išči"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Dodatno"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Pokaži aplikacije"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Pokaži moč Wi-Fi-ja"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Vzpostavi povezavo z omrežjem"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Zapomni si omrežje"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pozabi omrežje"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"Način klicanja prek Wi-Fi-ja"</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>
+    <item msgid="3132912693346866895">"Samo Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Izklopljeno"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Prednostno – Wi-Fi (Uporablja mobilno omrežje, če Wi-Fi ni na voljo.)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Prednostno – mobilno omrežje (Wi-Fi uporablja samo, če mobilno omrežje ni na voljo.)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Samo Wi-Fi (Ne uporablja mobil. omrežja. Klicanje ali sprejemanje klicev brez Wi-Fi-ja ni mogoče.)"</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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Stanje baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Raven napolnjenosti baterije"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"S tem bodo na tovarniške nastavitve ponastavljene vse nastavitve, povezane z omrežnimi povezavami, 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Če želite potrditi ponastavitev omrežnih nastavitev, morate narisati vzorec za odklepanje."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Želite ponastaviti?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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>
@@ -1107,6 +1127,8 @@
     <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="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_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>
@@ -1152,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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>
@@ -1704,14 +1726,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>
@@ -1750,7 +1778,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>
@@ -1849,12 +1877,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>
@@ -2026,6 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_all_apps" msgid="5377153522551809915">"aplikacije prenos sistem"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"varnost dovoljenj za aplikacije"</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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d aplikacija ponuja pogoje</item>
+      <item quantity="two">%d aplikaciji ponujata pogoje</item>
+      <item quantity="few">%d aplikacije ponujajo pogoje</item>
+      <item quantity="other">%d aplikacij ponuja 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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Ponastavi nastavitve v vseh aplikacijah na privzete"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Število nameščenih aplikacij, vključno s sistemskimi in prenesenimi aplikacijami: <xliff:g id="COUNT">%d</xliff:g>"</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>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 3fe8f5d..dc57492 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -87,7 +87,7 @@
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Скенирање..."</item>
     <item msgid="8513729475867537913">"Повезивање…"</item>
-    <item msgid="515055375277271756">"Проверавање идентитета…"</item>
+    <item msgid="515055375277271756">"Потврђује се аутентичност..."</item>
     <item msgid="1943354004029184381">"Преузимање IP адресе..."</item>
     <item msgid="4221763391123233270">"Повезано"</item>
     <item msgid="624838831631122137">"Обустављено"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -146,29 +145,33 @@
     <item msgid="5198271470953124739">"Без чекања"</item>
   </string-array>
   <string-array name="wifi_signal">
-    <item msgid="2245412278046491293">"Слабо"</item>
+    <item msgid="2245412278046491293">"Слаба"</item>
     <item msgid="5615082285463430971">"Задовољавајућа"</item>
-    <item msgid="3565079809875324621">"Добро"</item>
+    <item msgid="3565079809875324621">"Добра"</item>
     <item msgid="5702329417707689835">"Одлично"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Увек"</item>
     <item msgid="844721238536786870">"Само када је укључен"</item>
-    <item msgid="2990218920631468642">"Никад (повећава искоришћеност података)"</item>
+    <item msgid="1986753720941888596">"Никад"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Увек"</item>
     <item msgid="7433294150916905997">"Само када је укључен"</item>
     <item msgid="1390404486722375028">"Никада"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Последњих 30 дана"</item>
+    <item msgid="6600989128423965319">"Подеси циклус потрошње..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Аутоматски"</item>
+    <item msgid="1013988753804838790">"Аутоматски"</item>
     <item msgid="6670588712989942178">"Само на 5 GHz"</item>
     <item msgid="2715516524973207876">"Само на 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Време коришћења"</item>
-    <item msgid="3703676222230317933">"Покрени бројање"</item>
+    <item msgid="4796160515314745154">"Последњи пут коришћено"</item>
     <item msgid="2502754479975776899">"Назив апликације"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -194,7 +197,7 @@
     <item msgid="628395202971532382">"Статички"</item>
   </string-array>
   <string-array name="wifi_proxy_settings">
-    <item msgid="4473276491748503377">"Ништа"</item>
+    <item msgid="4473276491748503377">"Нема"</item>
     <item msgid="8673874894887358090">"Ручно"</item>
     <item msgid="168893341855953140">"Аутом. конфиг. проксија"</item>
   </string-array>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"јачина звука аларма"</item>
     <item msgid="785049718065337473">"јачина звука обавештења"</item>
     <item msgid="6700305533746877052">"јачина звука Bluetooth-а"</item>
-    <item msgid="3810969981743709839">"искључи/укључи звук микрофона"</item>
-    <item msgid="2627903914574908209">"задржи ван стања спавања"</item>
-    <item msgid="1395372654968157578">"прати локацију"</item>
-    <item msgid="3238451051299611853">"прати локацију са високим напоном"</item>
+    <item msgid="2029227495214047094">"задржавање ван стања спавања"</item>
+    <item msgid="26109888160231211">"праћење локације"</item>
+    <item msgid="5753382310468855812">"надгледање локације са високим напоном"</item>
+    <item msgid="3356591542543137332">"преузми статистику о коришћењу"</item>
+    <item msgid="3073734345226842233">"искључи/укључи звук микрофона"</item>
+    <item msgid="1148142988678569310">"медији за пројекат"</item>
+    <item msgid="9130014005474445273">"активирај VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Локација"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Јачина звука аларма"</item>
     <item msgid="9103719301075748925">"Јачина звука обавештења"</item>
     <item msgid="7025966722295861512">"Јачина звука Bluetooth-а"</item>
-    <item msgid="2265317984004577529">"Искључи/укључи звук микрофона"</item>
-    <item msgid="3646325683886507917">"Задржи ван стања спавања"</item>
+    <item msgid="4665183401128289653">"Задржи ван стања спавања"</item>
+    <item msgid="8584357129746649222">"Локација"</item>
     <item msgid="7669257279311110599">"Локација"</item>
-    <item msgid="7745724368696313169">"Локација"</item>
+    <item msgid="3459320345690097795">"Преузми статистику о коришћењу"</item>
+    <item msgid="1312534577834048535">"Искључи/укључи звук микрофона"</item>
+    <item msgid="5906017727368097853">"Медији за пројекат"</item>
+    <item msgid="2486614710846178542">"Активирај VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Подразумевано"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Скупљени sans-serif"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Непропорционално"</item>
-    <item msgid="6857338041963571301">"Опуштено"</item>
-    <item msgid="961716102408512888">"Курзив"</item>
-    <item msgid="784581717183349567">"Мала почетна слова"</item>
+    <item msgid="7247838127505318669">"Sans-serif фиксне ширине"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif фиксне ширине"</item>
+    <item msgid="639503332147461010">"Опуштено"</item>
+    <item msgid="7967169925231332424">"Курзив"</item>
+    <item msgid="561832997193039673">"Мала почетна слова"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Веома мала"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 kB по баферу евиденције"</item>
     <item msgid="2822309747675758628">"256 kB по баферу евиденције"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кеширана (клијент активности)"</item>
     <item msgid="6652164677254579050">"Кеширана (празно)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Плавозелена"</item>
+    <item msgid="8332294763632946560">"Плава"</item>
+    <item msgid="2023216417616991392">"Тамноплава"</item>
+    <item msgid="3170497246594232819">"Љубичаста"</item>
+    <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 714d0b6..9381ae2 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +319,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 +339,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>
@@ -393,8 +407,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>
     <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>
@@ -405,7 +417,6 @@
     <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>
@@ -429,30 +440,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>
@@ -482,15 +499,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>
@@ -518,15 +528,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Напредни Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Када је Bluetooth укључен, уређај може да комуницира са другим Bluetooth уређајима у близини."</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 +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>
@@ -595,15 +583,11 @@
     <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>
@@ -626,6 +610,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скенирај"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Напредно"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Прикажи апликације"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Прикажи јачину за Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Повежи са мрежом"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Запамти мрежу"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Заборави мрежу"</string>
@@ -641,7 +627,7 @@
     <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>
@@ -667,20 +653,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>
@@ -753,6 +734,23 @@
     <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="3208568886184788972">"Режим позивања преко Wi-Fi-ја"</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>
+    <item msgid="3132912693346866895">"Само Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Искључено"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Предност има Wi-Fi (Мобилна мрежа се користи само ако Wi-Fi није доступан)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Предност има мобилна мрежа (Wi-Fi се користи само ако мобилна мрежа није доступна)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Само 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>
@@ -816,6 +814,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>
@@ -867,10 +870,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>
@@ -964,7 +968,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Статус батерије"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво батерије"</string>
@@ -1009,10 +1014,16 @@
     <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="5805796658276223307">"Овим ћете ресетовати сва подешавања у вези са умрежавањем на подразумеване фабричке вредности, укључујући:\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="1745138973574945389">"Желите ли да ресетујете сва подешавања мреже? Ова радња не може да се опозове!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Ресетуј подешавања"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Треба да нацртате шаблон за откључавање да бисте потврдили ресетовање подешавања мреже."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Желите ли да ресетујете?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ресетуј подешавања мреже"</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>
@@ -1107,6 +1118,8 @@
     <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_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,7 +1165,7 @@
     <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="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>
@@ -1398,17 +1411,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>
@@ -1447,19 +1449,29 @@
     <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>
@@ -1563,6 +1575,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 +1717,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>
@@ -1750,7 +1769,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>
@@ -1849,12 +1868,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 +2043,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>
@@ -2228,13 +2249,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>
@@ -2285,8 +2306,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>
@@ -2351,13 +2372,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>
@@ -2374,6 +2397,9 @@
     <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_all_apps" msgid="5377153522551809915">"преузимање апликација, апликације, систем"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"апликације дозволе безбедност"</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>
@@ -2418,29 +2444,33 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d апликација пружа услове</item>
+      <item quantity="few">%d апликације пружају услове</item>
+      <item quantity="other">%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>
@@ -2514,4 +2544,38 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Ресетујте подешавања за све апликације на подразумеване вредности"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Број инсталираних апликација је <xliff:g id="COUNT">%d</xliff:g>, укључујући системске и преузете апликације"</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>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 5493d79..9e2d0a7 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Alltid"</item>
     <item msgid="844721238536786870">"Endast när den är inkopplad"</item>
-    <item msgid="2990218920631468642">"Aldrig (ökar dataanvändningen)"</item>
+    <item msgid="1986753720941888596">"Aldrig"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Alltid"</item>
     <item msgid="7433294150916905997">"Endast när den är inkopplad"</item>
     <item msgid="1390404486722375028">"Aldrig"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Senaste 30 dagarna"</item>
+    <item msgid="6600989128423965319">"Ange användningscykel ..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Automatiskt"</item>
+    <item msgid="1013988753804838790">"Automatiskt"</item>
     <item msgid="6670588712989942178">"Endast 5 GHz"</item>
     <item msgid="2715516524973207876">"Endast 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Användningstid"</item>
-    <item msgid="3703676222230317933">"Starta räkneverk"</item>
+    <item msgid="4796160515314745154">"Användes senast"</item>
     <item msgid="2502754479975776899">"Appnamn"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarmvolym"</item>
     <item msgid="785049718065337473">"meddelandevolym"</item>
     <item msgid="6700305533746877052">"bluetooth-volym"</item>
-    <item msgid="3810969981743709839">"stäng av/slå på mikrofonen"</item>
-    <item msgid="2627903914574908209">"behåll aktiv"</item>
-    <item msgid="1395372654968157578">"övervaka plats"</item>
-    <item msgid="3238451051299611853">"övervaka batterikrävande plats"</item>
+    <item msgid="2029227495214047094">"behåll aktiv"</item>
+    <item msgid="26109888160231211">"övervaka plats"</item>
+    <item msgid="5753382310468855812">"övervaka batterikrävande plats"</item>
+    <item msgid="3356591542543137332">"få användningsstatistik"</item>
+    <item msgid="3073734345226842233">"stäng av/slå på mikrofonen"</item>
+    <item msgid="1148142988678569310">"projicera media"</item>
+    <item msgid="9130014005474445273">"aktivera VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Plats"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarmvolym"</item>
     <item msgid="9103719301075748925">"Meddelandevolym"</item>
     <item msgid="7025966722295861512">"Bluetooth-volym"</item>
-    <item msgid="2265317984004577529">"Stäng av/slå på mikrofonen"</item>
-    <item msgid="3646325683886507917">"Behåll aktiv"</item>
+    <item msgid="4665183401128289653">"Behåll aktiv"</item>
+    <item msgid="8584357129746649222">"Plats"</item>
     <item msgid="7669257279311110599">"Plats"</item>
-    <item msgid="7745724368696313169">"Plats"</item>
+    <item msgid="3459320345690097795">"Få användningsstatistik"</item>
+    <item msgid="1312534577834048535">"Stäng av/slå på mikrofonen"</item>
+    <item msgid="5906017727368097853">"Projicera media"</item>
+    <item msgid="2486614710846178542">"Aktivera VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Standard"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif Condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Informell"</item>
-    <item msgid="961716102408512888">"Kursiv"</item>
-    <item msgid="784581717183349567">"Kapitäler"</item>
+    <item msgid="7247838127505318669">"Jämnbreda typsnitt – sanserif"</item>
+    <item msgid="4478414822462359763">"Seriff"</item>
+    <item msgid="7502451783483660829">"Jämnbreda typsnitt – seriff"</item>
+    <item msgid="639503332147461010">"Informell"</item>
+    <item msgid="7967169925231332424">"Kursiv"</item>
+    <item msgid="561832997193039673">"Kapitäler"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Mycket liten"</item>
@@ -375,6 +385,11 @@
     <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 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">"64 kB/loggbuffert"</item>
     <item msgid="2822309747675758628">"256 kB/loggbuffert"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Cachelagrad (aktivitetsklient)"</item>
     <item msgid="6652164677254579050">"Cachelagrad (tom)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Blågrön"</item>
+    <item msgid="8332294763632946560">"Blå"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <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 d12d070..4a25674 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,30 @@
     <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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skanna"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avancerad"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Visa appar"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Visa Wi-Fi-styrka"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Kom ihåg nätverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glöm nätverk"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi-samtalsläge"</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>
+    <item msgid="3132912693346866895">"Endast Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Av"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi i första hand (Använder endast mobilnätverk om Wi-Fi inte är tillgängligt)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobil i första hand (Använder endast Wi-Fi om mobilnätverket inte är tillgängligt)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Endast Wi-Fi (Använder aldrig mobilnätverk. Det går inte att ringa eller ta emot samtal om Wi-Fi inte är tillgängligt)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batterinivå"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Alla inställningar kopplade till nätverket kommer att återställas till standardinställningarna, inklusive inställningarna för: \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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Du måste rita ditt grafiska lösenord om du vill återställa nätverksinställningarna."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Vill du återställa?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Nätverksinställningarna har å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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d appar innehåller villkor</item>
+      <item quantity="one">%d app 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 samtal och aviseringar"</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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Återställ inställningarna i alla apps till standardinställningarna"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> appar har installerats, inklusive systemappar och nedladdade appar"</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>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index cfdae49..52b4042 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -147,28 +146,32 @@
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Mbaya"</item>
-    <item msgid="5615082285463430971">"Ya Haki"</item>
+    <item msgid="5615082285463430971">"Wastani"</item>
     <item msgid="3565079809875324621">"Nzuri"</item>
     <item msgid="5702329417707689835">"Bora zaidi"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Daima"</item>
     <item msgid="844721238536786870">"Wakati inachaji pekee"</item>
-    <item msgid="2990218920631468642">"Kamwe (huongeza matumizi ya data)"</item>
+    <item msgid="1986753720941888596">"Katu"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Daima"</item>
     <item msgid="7433294150916905997">"Wakati inachaji pekee"</item>
     <item msgid="1390404486722375028">"kamwe"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Siku 30 zilizopita"</item>
+    <item msgid="6600989128423965319">"Weka mzunguko wa matumizi..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Kiotomatiki"</item>
+    <item msgid="1013988753804838790">"Otomatiki"</item>
     <item msgid="6670588712989942178">"GHz 5 tu"</item>
     <item msgid="2715516524973207876">"GHz 2.4 tu"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Muda wa utumiaji"</item>
-    <item msgid="3703676222230317933">"Zindua hesabu"</item>
+    <item msgid="4796160515314745154">"Mara ya mwisho ilipotumika"</item>
     <item msgid="2502754479975776899">"Jina la Programu"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"sauti ya kengele"</item>
     <item msgid="785049718065337473">"sauti ya arifa"</item>
     <item msgid="6700305533746877052">"sauti ya bluetooth"</item>
-    <item msgid="3810969981743709839">"zima au uwashe sauti ya maikrofoni"</item>
-    <item msgid="2627903914574908209">"kaa chonjo"</item>
-    <item msgid="1395372654968157578">"fuatilia mahali"</item>
-    <item msgid="3238451051299611853">"fuatilia mahali pakuu"</item>
+    <item msgid="2029227495214047094">"kaa chonjo"</item>
+    <item msgid="26109888160231211">"fuatilia eneo"</item>
+    <item msgid="5753382310468855812">"fuatilia eneo kuu"</item>
+    <item msgid="3356591542543137332">"pata takwimu za matumizi"</item>
+    <item msgid="3073734345226842233">"zima au uwashe sauti ya maikrofoni"</item>
+    <item msgid="1148142988678569310">"maudhui ya mradi"</item>
+    <item msgid="9130014005474445273">"anzisha VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Eneo"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Sauti ya kengele"</item>
     <item msgid="9103719301075748925">"Sauti ya arifa"</item>
     <item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
-    <item msgid="2265317984004577529">"Zima ama uwashe sauti ya maikrofoni"</item>
-    <item msgid="3646325683886507917">"Kaa chonjo"</item>
+    <item msgid="4665183401128289653">"Kaa chonjo"</item>
+    <item msgid="8584357129746649222">"Eneo"</item>
     <item msgid="7669257279311110599">"Eneo"</item>
-    <item msgid="7745724368696313169">"Mahali"</item>
+    <item msgid="3459320345690097795">"Pata takwimu za matumizi"</item>
+    <item msgid="1312534577834048535">"Zima ama uwashe sauti ya maikrofoni"</item>
+    <item msgid="5906017727368097853">"Maudhui ya mradi"</item>
+    <item msgid="2486614710846178542">"Anzisha VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Chaguo-msingi"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif iliyofupishwa"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Ya kawaida"</item>
-    <item msgid="961716102408512888">"Ulioviringwa"</item>
-    <item msgid="784581717183349567">"Herufi kubwa ndogo"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"Ya kawaida"</item>
+    <item msgid="7967169925231332424">"Mwandiko ulioviringwa na kuunganishwa"</item>
+    <item msgid="561832997193039673">"Herufi kubwa zenye umbo ndogo"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Madogo sana"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"M4"</item>
     <item msgid="3025431211013424097">"M16"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"K64"</item>
+    <item msgid="3534782711045262344">"K256"</item>
+    <item msgid="8085867209202153403">"M1"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"K64 kwa kumbukumbu"</item>
     <item msgid="2822309747675758628">"K256 kwa kumbukumbu"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Imewekwa akiba (kiteja cha shughuli)"</item>
     <item msgid="6652164677254579050">"Imewekwa akiba (tupu)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Samawati"</item>
+    <item msgid="2023216417616991392">"Bluu"</item>
+    <item msgid="3170497246594232819">"Zambarau"</item>
+    <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 39c90ee..3121c52 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>
@@ -137,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>
@@ -156,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>
@@ -329,9 +320,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>
@@ -352,6 +340,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>
@@ -395,8 +407,6 @@
     <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>
@@ -407,7 +417,6 @@
     <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>
@@ -433,18 +442,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>
@@ -474,15 +495,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>
@@ -510,15 +524,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth mahiri"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Bluetooth ikiwa imewashwa, kifaa chako kinaweza kuwasiliana na vifaa vingine vyenye Bluetooth vilivyo karibu."</string>
     <string name="bluetooth_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>
@@ -531,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>
@@ -587,15 +579,11 @@
     <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>
@@ -618,6 +606,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi ya Moja kwa Moja"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tafuta"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mipangilio ya kina"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Onyesha Programu"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Onyesha Nguvu ya WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Kumbuka mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
@@ -633,7 +623,7 @@
     <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>
@@ -659,20 +649,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>
@@ -745,6 +730,23 @@
     <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="3208568886184788972">"Hali ya upigaji simu kwa Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi-Fi pekee"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Imezimwa"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Inayopendelea Wi-Fi (Hutumia mtandao wa simu wakati tu Wi-Fi haipatikani)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Inayopendelea mitandao ya simu za mkononi (Hutumia Wi-Fi wakati tu mtandao wa simu haupatikani)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi pekee (Haitumii kamwe mtandao wa simu. Haiwezi kupiga au kupokea simu kama Wi-Fi haipatikani)"</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>
@@ -808,6 +810,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>
@@ -859,10 +866,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>
@@ -956,7 +963,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Hali ya betri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Kiwango cha betri"</string>
@@ -1001,10 +1009,16 @@
     <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="5805796658276223307">"Hii itaweka upya mipangilio yote inayohusiana na mitandao kuwa ile iliyowekwa viwandani kama chaguo msingi, ikiwemo:\n\n"<li>"Wifi"</li>\n<li>"Data ya vifaa vya 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="1745138973574945389">"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_gesture_explanation" msgid="8615374120762720549">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe kuweka upya mipangilio ya mtandao."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Iwekwe upya?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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>
@@ -1101,6 +1115,8 @@
     <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="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_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>
@@ -1146,7 +1162,7 @@
     <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="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>
@@ -1392,17 +1408,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>
@@ -1441,19 +1446,29 @@
     <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>
@@ -1557,6 +1572,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>
@@ -1698,14 +1714,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>
@@ -1744,7 +1766,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>
@@ -1843,12 +1865,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>
@@ -2020,6 +2040,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>
@@ -2222,13 +2246,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>
@@ -2279,8 +2303,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>
@@ -2345,13 +2369,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>
@@ -2368,6 +2394,9 @@
     <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_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_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>
@@ -2412,29 +2441,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">Programu %d hutoa masharti</item>
+      <item quantity="one">Programu %d hutoa 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>
@@ -2508,4 +2539,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Weka mapendeleo chaguo-msingi upya katika programu zote"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Programu <xliff:g id="COUNT">%d</xliff:g> zimesakinishwa, ikiwemo mfumo na programu zilizopakuliwa"</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>
 </resources>
diff --git a/res/values-ta-rIN-nokeys/strings.xml b/res/values-ta-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..6ca99f2
--- /dev/null
+++ b/res/values-ta-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"பயன்பாடுகளை நிர்வகித்தல்"</string>
+</resources>
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta-rIN/arrays.xml
index b9d3d63..cfbc0a7 100644
--- a/res/values-ta-rIN/arrays.xml
+++ b/res/values-ta-rIN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -129,14 +128,14 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"புஷ் பொத்தான்"</item>
-    <item msgid="1624323946324499595">"பியர் சாதனத்திலிருந்து PIN"</item>
-    <item msgid="5366790421523328066">"இந்தச் சாதனத்தில் உள்ள PIN"</item>
+    <item msgid="1624323946324499595">"பியர் சாதனத்திலிருந்து பின்"</item>
+    <item msgid="5366790421523328066">"இந்தச் சாதனத்தில் உள்ள பின்"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"இணைக்கப்பட்டது"</item>
     <item msgid="3189211552661432651">"அழைக்கப்பட்டது"</item>
     <item msgid="3206450250360237549">"தோல்வி"</item>
-    <item msgid="7785896708926971207">"கிடைக்கிறது"</item>
+    <item msgid="7785896708926971207">"உள்ளது"</item>
     <item msgid="2330782789550628803">"எல்லைக்கு வெளியே உள்ளது"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"எப்போதும்"</item>
     <item msgid="844721238536786870">"செருகப்பட்டிருக்கும்போது மட்டும்"</item>
-    <item msgid="2990218920631468642">"எப்போதும் வேண்டாம் (தரவு பயன்பாட்டை அதிகரிக்கும்)"</item>
+    <item msgid="1986753720941888596">"எப்போதும் வேண்டாம்"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"எப்போதும்"</item>
     <item msgid="7433294150916905997">"செருகப்பட்டிருக்கும்போது மட்டும்"</item>
     <item msgid="1390404486722375028">"ஒருபோதும் வேண்டாம்"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"கடந்த 30 நாட்கள்"</item>
+    <item msgid="6600989128423965319">"பயன்பாட்டு சுழற்சியை அமை..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"தானியங்கு"</item>
+    <item msgid="1013988753804838790">"தானியங்கு"</item>
     <item msgid="6670588712989942178">"5 GHz மட்டும்"</item>
     <item msgid="2715516524973207876">"2.4 GHz மட்டும்"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"பயன்படுத்திய நேரம்"</item>
-    <item msgid="3703676222230317933">"துவக்க எண்ணிக்கை"</item>
+    <item msgid="4796160515314745154">"கடைசியாகப் பயன்படுத்தியது"</item>
     <item msgid="2502754479975776899">"பயன்பாட்டின் பெயர்"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -228,7 +231,7 @@
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"இருப்பிடம்"</item>
     <item msgid="255608127647030286">"தனிப்பட்டவை"</item>
-    <item msgid="4588829735729884491">"செய்தியிடல்"</item>
+    <item msgid="4588829735729884491">"மெசேஜ்"</item>
     <item msgid="886742181977884584">"ஊடகம்"</item>
     <item msgid="7924928667052300589">"சாதனம்"</item>
   </string-array>
@@ -243,7 +246,7 @@
     <item msgid="6546959730920410907">"அழைப்புப் பதிவை மாற்று"</item>
     <item msgid="446877710771379667">"கேலெண்டரைப் படி"</item>
     <item msgid="7674458294386319722">"கேலெண்டரை மாற்று"</item>
-    <item msgid="8281201165558093009">"wi-fi ஸ்கேன்"</item>
+    <item msgid="8281201165558093009">"வைஃபை ஸ்கேன்"</item>
     <item msgid="8694611243479480497">"அறிவிப்பு"</item>
     <item msgid="7776439107987345446">"கைபேசியை ஸ்கேன் செய்"</item>
     <item msgid="514615766544675057">"தொலைபேசியை அழை"</item>
@@ -268,15 +271,18 @@
     <item msgid="4547883971364273343">"ஆடியோவை மையப்படுத்து"</item>
     <item msgid="2603878814882344450">"முதன்மை ஒலியளவு"</item>
     <item msgid="7136963238377062018">"குரல் ஒலியளவு"</item>
-    <item msgid="4270236897655923007">"ரிங் ஒலியளவு"</item>
+    <item msgid="4270236897655923007">"அழைப்பு - ஒலியளவு"</item>
     <item msgid="6325739889222559394">"மீடியாவின் ஒலியளவு"</item>
     <item msgid="5762123934816216821">"அலாரத்தின் ஒலியளவு"</item>
     <item msgid="785049718065337473">"அறிவிப்பின் ஒலியளவு"</item>
-    <item msgid="6700305533746877052">"Bluetooth ஒலியளவு"</item>
-    <item msgid="3810969981743709839">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
-    <item msgid="2627903914574908209">"எப்போதும் செயலில்"</item>
-    <item msgid="1395372654968157578">"இருப்பிடத்தைக் கண்காணி"</item>
-    <item msgid="3238451051299611853">"அதிக ஆற்றல் இடத்தைக் கண்காணி"</item>
+    <item msgid="6700305533746877052">"புளூடூத் ஒலியளவு"</item>
+    <item msgid="2029227495214047094">"செயலில்"</item>
+    <item msgid="26109888160231211">"இருப்பிடத்தைக் கண்காணி"</item>
+    <item msgid="5753382310468855812">"அதிக ஆற்றல் இடத்தைக் கண்காணி"</item>
+    <item msgid="3356591542543137332">"பயன்பாட்டு புள்ளிவிவரத்தைப் பெறுக"</item>
+    <item msgid="3073734345226842233">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
+    <item msgid="1148142988678569310">"புராஜக்ட் மீடியா"</item>
+    <item msgid="9130014005474445273">"VPNஐ இயக்கு"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"இருப்பிடம்"</item>
@@ -314,15 +320,18 @@
     <item msgid="3265262911688671938">"ஆடியோவை மையப்படுத்து"</item>
     <item msgid="2098976479485046797">"முதன்மை ஒலியளவு"</item>
     <item msgid="5660213838861789350">"குரல் ஒலியளவு"</item>
-    <item msgid="7983336752371254444">"ரிங் ஒலியளவு"</item>
+    <item msgid="7983336752371254444">"அழைப்பு - ஒலியளவு"</item>
     <item msgid="7878027809189330917">"மீடியாவின் ஒலியளவு"</item>
     <item msgid="7260546305036218513">"அலாரத்தின் ஒலியளவு"</item>
     <item msgid="9103719301075748925">"அறிவிப்பின் ஒலியளவு"</item>
-    <item msgid="7025966722295861512">"Bluetooth ஒலியளவு"</item>
-    <item msgid="2265317984004577529">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
-    <item msgid="3646325683886507917">"எப்போதும் செயலில்"</item>
+    <item msgid="7025966722295861512">"புளூடூத் ஒலியளவு"</item>
+    <item msgid="4665183401128289653">"விழிப்பில்"</item>
+    <item msgid="8584357129746649222">"இருப்பிடம்"</item>
     <item msgid="7669257279311110599">"இருப்பிடம்"</item>
-    <item msgid="7745724368696313169">"இருப்பிடம்"</item>
+    <item msgid="3459320345690097795">"பயன்பாட்டு புள்ளிவிவரத்தைப் பெறுக"</item>
+    <item msgid="1312534577834048535">"மைக்ரோஃபோனை முடக்கு/இயக்கு"</item>
+    <item msgid="5906017727368097853">"புராஜக்ட் மீடியா"</item>
+    <item msgid="2486614710846178542">"VPNஐ இயக்கு"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"குறுகியது"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"இயல்புநிலை"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif குறுகியது"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"மோனோஸ்பேஸ்"</item>
-    <item msgid="6857338041963571301">"கேஷ்வல்"</item>
-    <item msgid="961716102408512888">"இணைவெழுத்து முறை"</item>
-    <item msgid="784581717183349567">"சிறிய எழுத்துகள்"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif monospace"</item>
+    <item msgid="639503332147461010">"கேஷ்வல்"</item>
+    <item msgid="7967169925231332424">"இணைவெழுத்து முறை"</item>
+    <item msgid="561832997193039673">"சிறிய எழுத்துகள்"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"மிகச் சிறிய"</item>
@@ -375,12 +385,17 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
-    <item msgid="7346595473588765019">"64K / லாக் பவ்ஃவர்"</item>
-    <item msgid="2822309747675758628">"256K / லாக் பவ்ஃவர்"</item>
-    <item msgid="6699306198357496731">"1M / லாக் பவ்ஃவர்"</item>
-    <item msgid="5748528643937500349">"4M / லாக் பவ்ஃவர்"</item>
-    <item msgid="1978629051085111592">"16M / லாக் பவ்ஃவர்"</item>
+    <item msgid="7346595473588765019">"64K / லாக் பஃபர்"</item>
+    <item msgid="2822309747675758628">"256K / லாக் பஃபர்"</item>
+    <item msgid="6699306198357496731">"1M / லாக் பஃபர்"</item>
+    <item msgid="5748528643937500349">"4M / லாக் பஃபர்"</item>
+    <item msgid="1978629051085111592">"16M / லாக் பஃபர்"</item>
   </string-array>
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"எப்போதும் சரிபார்க்க வேண்டாம்"</item>
@@ -487,8 +502,8 @@
   </string-array>
   <string-array name="entries_zen_mode">
     <item msgid="816404936744485190">"முடக்கத்தில்"</item>
-    <item msgid="5656544177755411222">"வரையறுத்த குறுக்கீடுகள்"</item>
-    <item msgid="8735337502532332056">"பூஜ்ஜிய குறுக்கீடுகள்"</item>
+    <item msgid="5656544177755411222">"குறிப்பிட்ட அறிவிப்புகள் மட்டும்"</item>
+    <item msgid="8735337502532332056">"எதையும் தெரிவிக்காதே"</item>
   </string-array>
   <string-array name="proc_stats_memory_states">
     <item msgid="8845855295876909468">"இயல்பு"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"தற்காலிகச் சேமிப்பு (செயல்பாட்டு கிளையன்ட்)"</item>
     <item msgid="6652164677254579050">"தற்காலிகச் சேமிப்பு (காலி)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"பசும் நீலம்"</item>
+    <item msgid="8332294763632946560">"நீலம்"</item>
+    <item msgid="2023216417616991392">"அடர் நீலம்"</item>
+    <item msgid="3170497246594232819">"ஊதா"</item>
+    <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 f16bbaf..be85c68 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>
@@ -137,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>
@@ -156,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>
@@ -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="TRUST_AGENT_NAME">%2$s</xliff:g> பயன்படுத்தாத போது, <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>க்குப் பின் உறக்கநிலையில் வை"</string>
@@ -350,6 +338,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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"மேம்பட்ட புளூடூத்"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"புளூடூத் இயக்கத்தில் இருக்கும்போது, உங்கள் சாதனம் அருகிலுள்ள பிற புளூடூத் சாதனங்களைத் தொடர்புகொள்ளலாம்."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"வைஃபை டைரக்ட்"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"ஸ்கேன் செய்"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"மேம்பட்டவை"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"பயன்பாடுகளைக் காட்டு"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"வைஃபை வலிமையைக் காட்டு"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"நெட்வொர்க்குடன் இணை"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"நெட்வொர்க்கை நினைவில்கொள்"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"நெட்வொர்க்கை நீக்கு"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"வைஃபை அழைப்புப் பயன்முறை"</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>
+    <item msgid="3132912693346866895">"வைஃபை மட்டும்"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"முடக்கப்பட்டுள்ளது"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"வைஃபைக்கு முன்னுரிமை (வைஃபை கிடைக்காத போது மட்டும், செல் நெட்வொர்க்கைப் பயன்படுத்தும்)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"செல்லுலாருக்கு முன்னுரிமை (செல் நெட்வொர்க் கிடைக்காத போது மட்டும், வைஃபையைப் பயன்படுத்தும்)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"வைஃபை மட்டும் (செல் நெட்வொர்க்கை பயன்படுத்தாது. வைஃபை இல்லையெனில் அழைக்கவோ, அழைப்பை பெறவோ முடியாது)"</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 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"பேட்டரி நிலை"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"பேட்டரி நிலை"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"பின்வருபவை உட்பட நெட்வொர்க் சார்ந்த எல்லா அமைப்புகளும் ஆரம்பநிலைக்கு மீட்டமைக்கப்படும்:\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="1745138973574945389">"எல்லா நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? பழைய அமைப்புகள் மீண்டும் கிடைக்காது!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"அமைப்புகளை மீட்டமை"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"நெட்வொர்க் அமைப்புகளை மீட்டமைப்பதை உறுதிப்படுத்த, திறத்தல் வடிவத்தை வரைய வேண்டும்."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"மீட்டமைக்கவா?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"இருப்பிடத்தைக் கண்டறிய, GPSஐப் பயன்படுத்தவும்"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"ஸ்கேன் செய்தல்"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ஸ்கேன் செய்தல்"</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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"ஆப்ஸ் பதிவிறக்கு பயன்பாடுகள் முறைமை"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"பயன்பாடுகள் அனுமதிகள் பாதுகாப்பு"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d பயன்பாடுகள் நிபந்தனைகளை வழங்குகின்றன</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"எல்லா பயன்பாடுகளின் முன்விருப்பத்தேர்வுகளையும் இயல்புநிலைகளுக்கு மீட்டமைக்கும்"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"சிஸ்டம் மற்றும் பதிவிறக்கிய பயன்பாடுகள் உள்பட, <xliff:g id="COUNT">%d</xliff:g> பயன்பாடுகள் நிறுவப்பட்டன"</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>
 </resources>
diff --git a/res/values-te-rIN-nokeys/strings.xml b/res/values-te-rIN-nokeys/strings.xml
new file mode 100644
index 0000000..10cb6a3
--- /dev/null
+++ b/res/values-te-rIN-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"అనువర్తనాలను నిర్వహించండి"</string>
+</resources>
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te-rIN/arrays.xml
index 4b7090a..4b56a92 100644
--- a/res/values-te-rIN/arrays.xml
+++ b/res/values-te-rIN/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -129,8 +128,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"పుష్ బటన్"</item>
-    <item msgid="1624323946324499595">"పీర్ పరికరం నుండి PIN"</item>
-    <item msgid="5366790421523328066">"ఈ పరికరం నుండి PIN"</item>
+    <item msgid="1624323946324499595">"పీర్ పరికరం నుండి పిన్‌"</item>
+    <item msgid="5366790421523328066">"ఈ పరికరం నుండి పిన్‌"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"కనెక్ట్ చేయబడింది"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ఎల్లప్పుడూ"</item>
     <item msgid="844721238536786870">"ప్లగిన్ చేయబడినప్పుడు మాత్రమే"</item>
-    <item msgid="2990218920631468642">"ఎప్పటికీ వద్దు (డేటా వినియోగాన్ని పెంచుతుంది)"</item>
+    <item msgid="1986753720941888596">"ఎప్పటికీ వద్దు"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ఎల్లప్పుడూ"</item>
     <item msgid="7433294150916905997">"ప్లగిన్ చేయబడినప్పుడు మాత్రమే"</item>
     <item msgid="1390404486722375028">"ఎప్పటికీ వద్దు"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"గత 30 రోజులు"</item>
+    <item msgid="6600989128423965319">"విని. పునరా. సెట్ చేయి..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"స్వయంచాలకం"</item>
+    <item msgid="1013988753804838790">"స్వయంచాలకం"</item>
     <item msgid="6670588712989942178">"5 GHz మాత్రమే"</item>
     <item msgid="2715516524973207876">"2.4 GHz మాత్రమే"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"వినియోగ సమయం"</item>
-    <item msgid="3703676222230317933">"ప్రారంభ గణన"</item>
+    <item msgid="4796160515314745154">"చివరిగా ఉపయోగించినది"</item>
     <item msgid="2502754479975776899">"అనువర్తనం పేరు"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"అలారం వాల్యూమ్"</item>
     <item msgid="785049718065337473">"నోటిఫికేషన్ వాల్యూమ్"</item>
     <item msgid="6700305533746877052">"బ్లూటూత్ వాల్యూమ్"</item>
-    <item msgid="3810969981743709839">"మైక్రోఫోన్‌ను మ్యూట్ చేయి/అన్‌మ్యూట్ చేయి"</item>
-    <item msgid="2627903914574908209">"సక్రియంగా ఉంచు"</item>
-    <item msgid="1395372654968157578">"స్థానాన్ని పర్యవేక్షించు"</item>
-    <item msgid="3238451051299611853">"అధిక శక్తివంతమైన స్థానాన్ని పర్యవేక్షించు"</item>
+    <item msgid="2029227495214047094">"సక్రియంగా ఉంచండి"</item>
+    <item msgid="26109888160231211">"స్థానాన్ని పర్యవేక్షించండి"</item>
+    <item msgid="5753382310468855812">"అధిక శక్తివంతమైన స్థానాన్ని పర్యవేక్షించండి"</item>
+    <item msgid="3356591542543137332">"వినియోగ గణాంకాలను పొందండి"</item>
+    <item msgid="3073734345226842233">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
+    <item msgid="1148142988678569310">"ప్రాజెక్ట్ మీడియా"</item>
+    <item msgid="9130014005474445273">"VPNని సక్రియం చేయండి"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"స్థానం"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"అలారం వాల్యూమ్"</item>
     <item msgid="9103719301075748925">"నోటిఫికేషన్ వాల్యూమ్"</item>
     <item msgid="7025966722295861512">"బ్లూటూత్ వాల్యూమ్"</item>
-    <item msgid="2265317984004577529">"మైక్రోఫోన్‌ను మ్యూట్ చేయి/అన్‌మ్యూట్ చేయి"</item>
-    <item msgid="3646325683886507917">"సక్రియంగా ఉంచు"</item>
+    <item msgid="4665183401128289653">"సక్రియంగా ఉంచండి"</item>
+    <item msgid="8584357129746649222">"స్థానం"</item>
     <item msgid="7669257279311110599">"స్థానం"</item>
-    <item msgid="7745724368696313169">"స్థానం"</item>
+    <item msgid="3459320345690097795">"వినియోగ గణాంకాలను పొందండి"</item>
+    <item msgid="1312534577834048535">"మైక్రోఫోన్‌ను మ్యూట్ చేయండి/అన్‌మ్యూట్ చేయండి"</item>
+    <item msgid="5906017727368097853">"ప్రాజెక్ట్ మీడియా"</item>
+    <item msgid="2486614710846178542">"VPNని సక్రియం చేయండి"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"తక్కువ సేపు"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"డిఫాల్ట్"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif సంక్షిప్తం"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"మోనోస్పేస్"</item>
-    <item msgid="6857338041963571301">"సాధారణం"</item>
-    <item msgid="961716102408512888">"కర్సివ్"</item>
-    <item msgid="784581717183349567">"చిన్న క్యాపిటల్‌లు"</item>
+    <item msgid="7247838127505318669">"Sans-serif మోనోస్పేస్"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif మోనోస్పేస్"</item>
+    <item msgid="639503332147461010">"సాధారణం"</item>
+    <item msgid="7967169925231332424">"కర్సివ్"</item>
+    <item msgid="561832997193039673">"చిన్న క్యాపిటల్‌లు"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"చాలా చిన్నది"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"లాగ్ బఫర్‌కి 64K"</item>
     <item msgid="2822309747675758628">"లాగ్ బఫర్‌కి 256K"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"కాష్ చేసినవి (కార్యాచరణ క్లయింట్)"</item>
     <item msgid="6652164677254579050">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"నీలి ఆకుపచ్చ"</item>
+    <item msgid="8332294763632946560">"నీలం"</item>
+    <item msgid="2023216417616991392">"నీలిరంగు"</item>
+    <item msgid="3170497246594232819">"ఊదా"</item>
+    <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 0d9c65c..ceed517 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>
@@ -137,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>
@@ -156,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>
@@ -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">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"అధునాతన బ్లూటూత్"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"బ్లూటూత్ ప్రారంభించబడినప్పుడు, మీ పరికరం ఇతర సమీప బ్లూటూత్ పరికరాలతో కమ్యూనికేట్ చేయగలదు."</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"స్కాన్ చేయి"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"అధునాతనం"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"అనువర్తనాలను చూపు"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"వైఫై సామర్థ్యాన్ని చూపు"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"నెట్‌‍వర్క్‌కు కనెక్ట్ చేయి"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"నెట్‌వర్క్‌ను గుర్తుంచుకో"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"నెట్‌వర్క్‌ను విస్మరించు"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi కాలింగ్ మోడ్"</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>
+    <item msgid="3132912693346866895">"Wi-Fi మాత్రమే"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ఆఫ్‌లో ఉంది"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fiకి ప్రాధాన్యత (Wi-Fi అందుబాటులో లేకపోతే మాత్రమే సెల్ నెట్‌వర్క్‌ను ఉపయోగిస్తుంది)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"సెల్యులార్‌కి ప్రాధాన్యత (సెల్ నెట్‌వర్క్ అందుబాటులో లేకుంటే మాత్రమే Wi-Fiని ఉపయోగిస్తుంది)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"బ్యాటరీ స్థితి"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"బ్యాటరీ స్థాయి"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"దీని వలన వీటితో సహా నెట్‌వర్కింగ్‌కి సంబంధించిన అన్ని సెట్టింగ్‌లు ఫ్యాక్టరీ డిఫాల్ట్‌లకు రీసెట్ చేయబడతాయి:\n\n"<li>"Wifi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"మీరు నెట్‌వర్క్ సెట్టింగ్‌ల రీసెట్‌ను నిర్ధారించడానికి మీ అన్‌లాక్ నమూనాను గీయాలి."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"రీసెట్ చేయాలా?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_all_apps" msgid="5377153522551809915">"అనువర్తనాలు డౌన్‌లోడ్ అనువర్తనాలు సిస్టమ్"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"అనువర్తనాల అనుమతుల భద్రత"</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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d అనువర్తనాలు షరతులను అందిస్తాయి</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"అన్ని అనువర్తనాల్లో ప్రాధాన్యతలను డిఫాల్ట్‌లకు రీసెట్ చేస్తుంది"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"సిస్టమ్ మరియు డౌన్‌లోడ్ చేసిన అనువర్తనాలతో సహా <xliff:g id="COUNT">%d</xliff:g> అనువర్తనాలు ఇన్‌స్టాల్ చేయబడ్డాయి"</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>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 2d16199..5358ae5 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ทุกครั้ง"</item>
     <item msgid="844721238536786870">"เมื่อเสียบปลั๊กเท่านั้น"</item>
-    <item msgid="2990218920631468642">"ไม่เลย (เพิ่มการใช้งานข้อมูล)"</item>
+    <item msgid="1986753720941888596">"ไม่ต้องเลย"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ทุกครั้ง"</item>
     <item msgid="7433294150916905997">"เมื่อเสียบปลั๊กเท่านั้น"</item>
     <item msgid="1390404486722375028">"ไม่เลย"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 วันที่ผ่านมา"</item>
+    <item msgid="6600989128423965319">"ตั้งรอบการใช้..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"อัตโนมัติ"</item>
+    <item msgid="1013988753804838790">"อัตโนมัติ"</item>
     <item msgid="6670588712989942178">"5 GHz เท่านั้น"</item>
     <item msgid="2715516524973207876">"2.4 GHz เท่านั้น"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"เวลาในการใช้งาน"</item>
-    <item msgid="3703676222230317933">"นับจำนวนครั้งที่เปิดใช้งาน"</item>
+    <item msgid="4796160515314745154">"ครั้งสุดท้ายที่ใช้"</item>
     <item msgid="2502754479975776899">"ชื่อแอปพลิเคชัน"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"ระดับเสียงปลุก"</item>
     <item msgid="785049718065337473">"ระดับเสียงการแจ้งเตือน"</item>
     <item msgid="6700305533746877052">"ระดับเสียงบลูทูธ"</item>
-    <item msgid="3810969981743709839">"ปิด/เปิดเสียงไมโครโฟน"</item>
-    <item msgid="2627903914574908209">"ทำงานตลอดเวลา"</item>
-    <item msgid="1395372654968157578">"ตำแหน่งจอภาพ"</item>
-    <item msgid="3238451051299611853">"ตรวจติดตามตำแหน่งพลังงานสูง"</item>
+    <item msgid="2029227495214047094">"ทำงานตลอดเวลา"</item>
+    <item msgid="26109888160231211">"ตำแหน่งจอภาพ"</item>
+    <item msgid="5753382310468855812">"ติดตามตำแหน่งโดยใช้พลังงานมาก"</item>
+    <item msgid="3356591542543137332">"ดูสถิติการใช้งาน"</item>
+    <item msgid="3073734345226842233">"ปิด/เปิดเสียงไมโครโฟน"</item>
+    <item msgid="1148142988678569310">"สื่อของโครงการ"</item>
+    <item msgid="9130014005474445273">"เปิดใช้งาน VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"ตำแหน่ง"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"ระดับเสียงปลุก"</item>
     <item msgid="9103719301075748925">"ระดับเสียงของการแจ้งเตือน"</item>
     <item msgid="7025966722295861512">"ระดับบลูทูธ"</item>
-    <item msgid="2265317984004577529">"ปิด/เปิดเสียงไมโครโฟน"</item>
-    <item msgid="3646325683886507917">"ทำงานตลอดเวลา"</item>
+    <item msgid="4665183401128289653">"ทำงานตลอดเวลา"</item>
+    <item msgid="8584357129746649222">"ตำแหน่ง"</item>
     <item msgid="7669257279311110599">"ตำแหน่ง"</item>
-    <item msgid="7745724368696313169">"ตำแหน่ง"</item>
+    <item msgid="3459320345690097795">"ดูสถิติการใช้งาน"</item>
+    <item msgid="1312534577834048535">"ปิด/เปิดเสียงไมโครโฟน"</item>
+    <item msgid="5906017727368097853">"สื่อของโครงการ"</item>
+    <item msgid="2486614710846178542">"เปิดใช้งาน VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ค่าเริ่มต้น"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans-serif แบบย่อ"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"ช่องว่างเดี่ยว"</item>
-    <item msgid="6857338041963571301">"แบบไม่เป็นทางการ"</item>
-    <item msgid="961716102408512888">"แบบคัดลายมือ"</item>
-    <item msgid="784581717183349567">"อักษรตัวพิมพ์ใหญ่ขนาดเล็ก"</item>
+    <item msgid="7247838127505318669">"Sans-serif ความกว้างคงที่"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif ความกว้างคงที่"</item>
+    <item msgid="639503332147461010">"แบบไม่เป็นทางการ"</item>
+    <item msgid="7967169925231332424">"คัดลายมือ"</item>
+    <item msgid="561832997193039673">"อักษรตัวพิมพ์ใหญ่ขนาดเล็ก"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"เล็กมาก"</item>
@@ -375,6 +385,11 @@
     <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 ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
     <item msgid="2822309747675758628">"256 K ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
     <item msgid="6652164677254579050">"แคชไว้ (ว่างเปล่า)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"น้ำเงินอมเขียว"</item>
+    <item msgid="8332294763632946560">"น้ำเงิน"</item>
+    <item msgid="2023216417616991392">"น้ำเงินอมม่วง"</item>
+    <item msgid="3170497246594232819">"ม่วง"</item>
+    <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 d8e7be3..11c46db 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</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>
@@ -393,8 +405,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">"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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"บลูทูธขั้นสูง"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"เมื่อเปิดบลูทูธ อุปกรณ์ของคุณจะสื่อสารกับอุปกรณ์บลูทูธที่อยู่ใกล้ๆ ได้"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"สแกน"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"ขั้นสูง"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"แสดงแอป"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"แสดงความแรงของ Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"เชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"จดจำเครือข่ายไว้"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ไม่จำเครือข่าย"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"โหมดการโทรผ่าน Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Wi-Fi เท่านั้น"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"ปิด"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"ต้องการใช้ Wi-Fi (ใช้เครือข่ายมือถือต่อเมื่อ Wi-Fi ไม่พร้อมใช้งาน)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"ต้องการใช้เครือข่ายมือถือ (ใช้ Wi-Fi ต่อเมื่อเครือข่ายมือถือไม่พร้อมใช้งาน)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"สถานะแบตเตอรี่"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"ระดับแบตเตอรี่"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"ระบบจะรีเซ็ตการตั้งค่าทั้งหมดที่เกี่ยวข้องกับเครือข่ายเป็นค่าเริ่มต้น รวมถึง:\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="1745138973574945389">"ต้องการรีเซ็ตการตั้งค่าเครือข่ายทั้งหมดหรือ คุณจะไม่สามารถย้อนกลับได้!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"รีเซ็ตการตั้งค่า"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"คุณต้องวาดรูปแบบการปลดล็อกเพื่อยืนยันการรีเซ็ตการตั้งค่าเครือข่าย"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"รีเซ็ตไหม"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"แอป ดาวน์โหลด แอปพลิเคชัน ระบบ"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d แอปให้บริการเงื่อนไข</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"รีเซ็ตค่ากำหนดในทุกแอปเป็นค่าเริ่มต้น"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"ติดตั้ง <xliff:g id="COUNT">%d</xliff:g> แอป รวมถึงแอประบบและแอปที่ดาวน์โหลดแล้ว"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"ขั้นสูง"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"แอปที่ไม่รู้จัก"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"เลือกโปรไฟล์"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 0810c27..ce549ce 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Palagi"</item>
     <item msgid="844721238536786870">"Kapag naka-plug in lamang"</item>
-    <item msgid="2990218920631468642">"Hindi Kailanman (pinapataas ang paggamit ng data)"</item>
+    <item msgid="1986753720941888596">"Hindi Kailanman"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Palagi"</item>
     <item msgid="7433294150916905997">"Kapag naka-plug in lamang"</item>
     <item msgid="1390404486722375028">"Hindi Kailanman"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Nakalipas na 30 araw"</item>
+    <item msgid="6600989128423965319">"Itakda ang usage cycle..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Awto"</item>
+    <item msgid="1013988753804838790">"Awtomatiko"</item>
     <item msgid="6670588712989942178">"5 GHz lang"</item>
     <item msgid="2715516524973207876">"2.4 GHz lang"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Oras ng paggamit"</item>
-    <item msgid="3703676222230317933">"Bilang ng paglunsad"</item>
+    <item msgid="4796160515314745154">"Huling oras na ginamit"</item>
     <item msgid="2502754479975776899">"Pangalan ng app"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"volume ng alarma"</item>
     <item msgid="785049718065337473">"volume ng notification"</item>
     <item msgid="6700305533746877052">"volume ng bluetooth"</item>
-    <item msgid="3810969981743709839">"i-mute/i-unmute ang mikropono"</item>
-    <item msgid="2627903914574908209">"panatilihing bukas"</item>
-    <item msgid="1395372654968157578">"subaybayan ang lokasyon"</item>
-    <item msgid="3238451051299611853">"subaybayan ang lokasyon na gumagamit ng maraming power"</item>
+    <item msgid="2029227495214047094">"panatilihing bukas"</item>
+    <item msgid="26109888160231211">"subaybayan ang lokasyon"</item>
+    <item msgid="5753382310468855812">"subaybayan ang lokasyon na gumagamit ng maraming power"</item>
+    <item msgid="3356591542543137332">"kumuha ng stats sa paggamit"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Lokasyon"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Volume ng alarm"</item>
     <item msgid="9103719301075748925">"Volume ng notification"</item>
     <item msgid="7025966722295861512">"Volume ng Bluetooth"</item>
-    <item msgid="2265317984004577529">"I-mute/i-unmute ang mikropono"</item>
-    <item msgid="3646325683886507917">"Panatilihing bukas"</item>
+    <item msgid="4665183401128289653">"Panatilihing bukas"</item>
+    <item msgid="8584357129746649222">"Lokasyon"</item>
     <item msgid="7669257279311110599">"Lokasyon"</item>
-    <item msgid="7745724368696313169">"Lokasyon"</item>
+    <item msgid="3459320345690097795">"Kumuha ng stats sa paggamit"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Default"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Monospace"</item>
-    <item msgid="6857338041963571301">"Casual"</item>
-    <item msgid="961716102408512888">"Cursive"</item>
-    <item msgid="784581717183349567">"Maliliit na capital"</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">"Maliliit na capital"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Napakaliit"</item>
@@ -361,7 +371,7 @@
     <item msgid="8342334626783983353">"100%"</item>
   </string-array>
   <string-array name="captioning_preset_selector_titles">
-    <item msgid="7009918361545506251">"Gamitin ang mga default ng app"</item>
+    <item msgid="7009918361545506251">"Gamitin ang app default"</item>
     <item msgid="1770533843436933500">"Puti sa itim"</item>
     <item msgid="758587126802411846">"Itim sa puti"</item>
     <item msgid="1495307195241623402">"Dilaw sa itim"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K kada log buffer"</item>
     <item msgid="2822309747675758628">"256K kada log buffer"</item>
@@ -384,7 +399,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">
@@ -437,8 +452,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>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Naka-cache (client ng gawain)"</item>
     <item msgid="6652164677254579050">"Naka-cache (walang laman)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Teal"</item>
+    <item msgid="8332294763632946560">"Asul"</item>
+    <item msgid="2023216417616991392">"Indigo"</item>
+    <item msgid="3170497246594232819">"Lila"</item>
+    <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 79754db..2e5f11c 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,6 @@
     <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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"I-scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Ipakita ang mga App"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Ipakita Lakas ng WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kumonekta sa network"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Tandaan ang network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi calling mode"</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>
+    <item msgid="3132912693346866895">"Wi-Fi lang"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Naka-off"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Mas gusto ang Wi-Fi (Gumagamit lang ng cell network kung walang Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mas gusto ang cellular (Gumagamit lang ng Wi-Fi kung walang cell network)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Wi-Fi lang (Di gumagamit ng cell network. Di makakatawag o makakatanggap ng tawag kung walang Wi-Fi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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">"Status ng baterya"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Antas ng baterya"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Ire-reset nito sa mga default ng factory ang lahat ng setting na kaugnay sa networking, kabilang ang:\n\n"<li>"Wifi"</li>\n<li>"Data sa mobile"</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="1745138973574945389">"I-reset ang lahat ng network setting? Hindi mo na mababawi ang pagkilos na ito!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"I-reset ang mga setting"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-reset ng mga network setting."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"I-reset?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"I-reset ang mga network setting"</string>
     <string name="device_reset_title" msgid="2384019005638768076">"I-reset ang device"</string>
     <string name="master_clear_title" msgid="5907939616087039756">"Factory data reset"</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_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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,20 @@
     <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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"system ng mga application ng pag-download ng mga app"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">Nagbibigay ang %d app ng mga kundisyon</item>
+      <item quantity="other">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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"I-reset ang mga kagustuhan sa lahat ng app sa mga default"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> (na) app ang naka-install, kasama na ang system at mga na-download na app"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index 55f5c28..2715533 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -153,22 +152,26 @@
   </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="2990218920631468642">"Hiçbir zaman (veri kullanımını artırır)"</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">
+    <item msgid="5013973108901348144">"Son 30 gün"</item>
+    <item msgid="6600989128423965319">"Kullanım döngüsünü ayarla..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Otomatik"</item>
+    <item msgid="1013988753804838790">"Otomatik"</item>
     <item msgid="6670588712989942178">"Yalnızca 5 GHz"</item>
     <item msgid="2715516524973207876">"Yalnızca 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Kullanım süresi"</item>
-    <item msgid="3703676222230317933">"Sayımı başlat"</item>
+    <item msgid="4796160515314745154">"Son kullanıldığı tarih"</item>
     <item msgid="2502754479975776899">"Uygulama adı"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"alarm sesi düzeyi"</item>
     <item msgid="785049718065337473">"bildirim sesi düzeyi"</item>
     <item msgid="6700305533746877052">"Bluetooth sesi düzeyi"</item>
-    <item msgid="3810969981743709839">"mikrofonu kapat/aç"</item>
-    <item msgid="2627903914574908209">"uyanık tut"</item>
-    <item msgid="1395372654968157578">"konumu izle"</item>
-    <item msgid="3238451051299611853">"yüksek güç tüketen konum hizmetlerini izle"</item>
+    <item msgid="2029227495214047094">"uyanık tut"</item>
+    <item msgid="26109888160231211">"konumu izle"</item>
+    <item msgid="5753382310468855812">"yüksek güç tüketen konum hizmetlerini izle"</item>
+    <item msgid="3356591542543137332">"kullanım istatistiklerini al"</item>
+    <item msgid="3073734345226842233">"mikrofonu kapat/aç"</item>
+    <item msgid="1148142988678569310">"medya yansıtma"</item>
+    <item msgid="9130014005474445273">"VPN\'yi etkinleştir"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Konum"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
     <item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
     <item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
-    <item msgid="2265317984004577529">"Mikrofonu kapat/aç"</item>
-    <item msgid="3646325683886507917">"Uyanık tut"</item>
+    <item msgid="4665183401128289653">"Uyanık tut"</item>
+    <item msgid="8584357129746649222">"Konum"</item>
     <item msgid="7669257279311110599">"Konum"</item>
-    <item msgid="7745724368696313169">"Konum"</item>
+    <item msgid="3459320345690097795">"Kullanım istatistiklerini al"</item>
+    <item msgid="1312534577834048535">"Mikrofonu kapat/aç"</item>
+    <item msgid="5906017727368097853">"Medya yansıtma"</item>
+    <item msgid="2486614710846178542">"VPN\'yi etkinleştir"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Varsayılan"</item>
     <item msgid="1016452621833735880">"Sans Serif"</item>
     <item msgid="2496277987934654454">"Sans Serif dar"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Sabit boşluklu"</item>
-    <item msgid="6857338041963571301">"Klasik"</item>
-    <item msgid="961716102408512888">"El yazısı"</item>
-    <item msgid="784581717183349567">"Küçük boyutlu büyük harfler"</item>
+    <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">"Gayriresmî"</item>
+    <item msgid="7967169925231332424">"Bitişik el yazısı"</item>
+    <item msgid="561832997193039673">"Küçük boyutlu büyük harfler"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Çok küçük"</item>
@@ -361,7 +371,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>
@@ -369,18 +379,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 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>
@@ -437,7 +452,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">
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Önbelleğe alındı (etkinlik istemcisi)"</item>
     <item msgid="6652164677254579050">"Önbelleğe alındı (boş)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Camgöbeği"</item>
+    <item msgid="8332294763632946560">"Mavi"</item>
+    <item msgid="2023216417616991392">"Çivit mavisi"</item>
+    <item msgid="3170497246594232819">"Mor"</item>
+    <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 5efe5de..2873892 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,6 @@
     <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">"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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,8 @@
     <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 parola 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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <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_apps" msgid="6003687912727859577">"Uygulamaları Göster"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Kablosuz Gücünü Göster"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Ağı hatırla"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Kablosuz çağrı modu"</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>
+    <item msgid="3132912693346866895">"Yalnızca kablosuz"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Kapalı"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Kablosuz tercih edildi (Hücresel ağ, yalnızca kablosuz ağ olmadığında kullanılır)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Hücresel ağ tercih edildi (Kablosuz bağlantı, yalnızca hücresel ağ mevcut değilse kullanılır)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Yalnızca kablosuz (Hücresel ağ asla kullanılmaz. Kablosuz ağ yoksa çağrı yapılamaz veya alınamaz)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Pil düzeyi"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Bu işlem ağ ile ilgili tüm ayarları fabrika varsayılanlarına sıfırlayacaktır. Sıfırlanacak ayarlar şunları içerir: \n\n"<li>"Kablosuz"</li>\n<li>"Mobil veri"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Ayarları sıfırla"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Tüm ağ ayarları 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_gesture_explanation" msgid="8615374120762720549">"Ağ ayarlarını sıfırlamayı onaylamak için kilit açma deseninizi çizmeniz gerekir."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Sıfırlansın mı?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"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>
@@ -1107,6 +1109,8 @@
     <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_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>
@@ -1152,7 +1156,7 @@
     <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="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 onaylayın"</string>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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="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>
@@ -1563,6 +1566,7 @@
     <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>
@@ -1704,14 +1708,20 @@
     <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> boyunca <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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"uygulama indirme uygulamalar sistem"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d uygulama koşul sağlıyor</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Tüm uygulamalardaki tercihleri varsayılanlara sıfırla"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Sistem uygulamaları ve indirilen uygulamalar dahil olmak üzere <xliff:g id="COUNT">%d</xliff:g> uygulama yüklendi"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 80e12be..56812fe 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -33,7 +33,7 @@
     <item msgid="3342301044271143016">"15 секунд"</item>
     <item msgid="8881760709354815449">"30 секунд"</item>
     <item msgid="7589406073232279088">"1 хвилина"</item>
-    <item msgid="7001195990902244174">"2 хв."</item>
+    <item msgid="7001195990902244174">"2 хвилини"</item>
     <item msgid="7489864775127957179">"5 хвилин"</item>
     <item msgid="2314124409517439288">"10 хвилин"</item>
     <item msgid="6864027152847611413">"30 хвилин"</item>
@@ -53,8 +53,8 @@
     <item msgid="6736512735606834431">"5 сек."</item>
     <item msgid="8044619388267891375">"15 сек."</item>
     <item msgid="1822002388249545488">"30 сек."</item>
-    <item msgid="8538071621211916519">"1 хв."</item>
-    <item msgid="5663439580228932882">"2 хв."</item>
+    <item msgid="8538071621211916519">"1 хвилина"</item>
+    <item msgid="5663439580228932882">"2 хвилини"</item>
     <item msgid="49888496216106852">"5 хвилин"</item>
     <item msgid="9002737361305019353">"10 хвилин"</item>
     <item msgid="4322676235684793329">"30 хвилин"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Завжди"</item>
     <item msgid="844721238536786870">"Лише в підключеному стані"</item>
-    <item msgid="2990218920631468642">"Ніколи (збільшує використання даних)"</item>
+    <item msgid="1986753720941888596">"Ніколи"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Завжди"</item>
     <item msgid="7433294150916905997">"Лише в підключеному стані"</item>
     <item msgid="1390404486722375028">"Ніколи"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Останні 30 днів"</item>
+    <item msgid="6600989128423965319">"Цикл використання даних…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Автоматично"</item>
+    <item msgid="1013988753804838790">"Автоматично"</item>
     <item msgid="6670588712989942178">"Лише 5 ГГц"</item>
     <item msgid="2715516524973207876">"Лише 2,3 ГГц"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Час використання"</item>
-    <item msgid="3703676222230317933">"Кількість запусків"</item>
+    <item msgid="4796160515314745154">"Останнє використання"</item>
     <item msgid="2502754479975776899">"Назва програми"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"гучність сигналу"</item>
     <item msgid="785049718065337473">"гучність сповіщення"</item>
     <item msgid="6700305533746877052">"гучність Bluetooth"</item>
-    <item msgid="3810969981743709839">"вимкнути або ввімкнути мікрофон"</item>
-    <item msgid="2627903914574908209">"залишати активним"</item>
-    <item msgid="1395372654968157578">"відстежувати місця"</item>
-    <item msgid="3238451051299611853">"відстежувати енерговитратні місця"</item>
+    <item msgid="2029227495214047094">"залишати активним"</item>
+    <item msgid="26109888160231211">"відстежувати місцезнаходження"</item>
+    <item msgid="5753382310468855812">"відстежувати енергозатратні місцезнаходження"</item>
+    <item msgid="3356591542543137332">"отримати статистику використання"</item>
+    <item msgid="3073734345226842233">"вимкнути або ввімкнути мікрофон"</item>
+    <item msgid="1148142988678569310">"транслювати вміст"</item>
+    <item msgid="9130014005474445273">"активувати VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Місцезнаходження"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Гучність сигналу"</item>
     <item msgid="9103719301075748925">"Гучність сповіщення"</item>
     <item msgid="7025966722295861512">"Гучність Bluetooth"</item>
-    <item msgid="2265317984004577529">"Вимкнути або ввімкнути мікрофон"</item>
-    <item msgid="3646325683886507917">"Залишати активним"</item>
+    <item msgid="4665183401128289653">"Залишати активним"</item>
+    <item msgid="8584357129746649222">"Місцезнаходження"</item>
     <item msgid="7669257279311110599">"Місцезнаходження"</item>
-    <item msgid="7745724368696313169">"Місце"</item>
+    <item msgid="3459320345690097795">"Отримати статистику використання"</item>
+    <item msgid="1312534577834048535">"Вимкнути або ввімкнути мікрофон"</item>
+    <item msgid="5906017727368097853">"Транслювати вміст"</item>
+    <item msgid="2486614710846178542">"Активувати VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Коротка"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"За умовчанням"</item>
     <item msgid="1016452621833735880">"Sans-Serif"</item>
     <item msgid="2496277987934654454">"Sans-Serif стиснений"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Однакової ширини"</item>
-    <item msgid="6857338041963571301">"Нерегулярний"</item>
-    <item msgid="961716102408512888">"Курсив"</item>
-    <item msgid="784581717183349567">"Зменшені великі букви"</item>
+    <item msgid="7247838127505318669">"Моноширинний Sans-Serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Моноширинний Serif"</item>
+    <item msgid="639503332147461010">"Неформальний шрифт"</item>
+    <item msgid="7967169925231332424">"Курсив"</item>
+    <item msgid="561832997193039673">"Зменшені великі букви"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Дуже малий"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4 Мб"</item>
     <item msgid="3025431211013424097">"16 Мб"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64 Кб"</item>
+    <item msgid="3534782711045262344">"256 Кб"</item>
+    <item msgid="8085867209202153403">"1 Мб"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"Буфер: макс. 64 Кб"</item>
     <item msgid="2822309747675758628">"Буфер: макс. 256 Кб"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Кеш (дії клієнта)"</item>
     <item msgid="6652164677254579050">"Кеш (порожньо)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Бірюзовий"</item>
+    <item msgid="8332294763632946560">"Синій"</item>
+    <item msgid="2023216417616991392">"Індиго"</item>
+    <item msgid="3170497246594232819">"Пурпуровий"</item>
+    <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 11e13c1..f73f458 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>
@@ -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."</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>
@@ -327,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>
@@ -350,6 +340,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>
@@ -393,8 +409,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>
     <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>
@@ -405,7 +419,6 @@
     <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>
@@ -429,30 +442,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>
@@ -482,15 +507,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>
@@ -518,15 +536,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Розшир. налаштування Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Коли Bluetooth увімкнено, пристрій може обмінюватися даними з пристроями Bluetooth поблизу."</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 +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>
@@ -595,15 +591,11 @@
     <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>
@@ -626,6 +618,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Сканув."</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Додатково"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Показати додатки"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Потужність Wi-Fi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Підключ. до мережі"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Зберегти мережу"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Видалити мережу"</string>
@@ -641,7 +635,7 @@
     <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>
@@ -667,20 +661,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>
@@ -753,6 +742,23 @@
     <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="3208568886184788972">"Режим дзвінків через Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Лише Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Вимкнено"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi за умовчанням (мобільна мережа використовується, лише якщо немає доступу до Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Мобільна мережа за умовчанням (Wi-Fi використовується, лише якщо немає доступу до мобільної мережі)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Лише 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>
@@ -816,6 +822,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>
@@ -867,10 +878,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>
@@ -964,7 +977,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Стан акумулятора"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Рівень заряду акумулятора"</string>
@@ -1009,10 +1023,16 @@
     <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="5805796658276223307">"Відновляться заводські налаштування мереж, зокрема:\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="1745138973574945389">"Скинути всі налаштування мереж? Цю дію не можна скасувати."</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Скинути налаштування"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Щоб скинути налаштування мереж, намалюйте ключ розблокування."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Скинути?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Скидання налаштувань мереж"</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>
@@ -1107,6 +1127,8 @@
     <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_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,7 +1174,7 @@
     <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="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>
@@ -1398,17 +1420,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>
@@ -1447,19 +1458,29 @@
     <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>
@@ -1563,6 +1584,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 +1726,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>
@@ -1750,7 +1778,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>
@@ -1849,12 +1877,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 +2052,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>
@@ -2228,13 +2258,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>
@@ -2285,8 +2315,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>
@@ -2351,13 +2381,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>
@@ -2374,6 +2406,9 @@
     <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_all_apps" msgid="5377153522551809915">"додатки завантажити додаток системний"</string>
+    <string name="keywords_app_permissions" msgid="8677901415217188314">"додатки дозволи безпека"</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>
@@ -2418,29 +2453,35 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d додаток надає умови</item>
+      <item quantity="few">%d додатки надають умови</item>
+      <item quantity="many">%d додатків надають умови</item>
+      <item quantity="other">%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>
@@ -2514,4 +2555,39 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Відновити параметри всіх додатків за умовчанням"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Встановлено додатків (зокрема системних і завантажених): <xliff:g id="COUNT">%d</xliff:g>"</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>
 </resources>
diff --git a/res/values-ur-rPK-nokeys/strings.xml b/res/values-ur-rPK-nokeys/strings.xml
new file mode 100644
index 0000000..5fee120
--- /dev/null
+++ b/res/values-ur-rPK-nokeys/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2007 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+  
+          http://www.apache.org/licenses/LICENSE-2.0
+  
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="applications_settings_summary" msgid="6616938758022986257">"ایپلیکیشنز کا نظم کریں"</string>
+</resources>
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur-rPK/arrays.xml
index 988d424..fa68b44 100644
--- a/res/values-ur-rPK/arrays.xml
+++ b/res/values-ur-rPK/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"ہمیشہ"</item>
     <item msgid="844721238536786870">"صرف پلگ ان ہونے پر"</item>
-    <item msgid="2990218920631468642">"کبھی نہیں (ڈیٹا کے استعمال میں اضافہ کر دیتا ہے)"</item>
+    <item msgid="1986753720941888596">"کبھی نہیں"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"ہمیشہ"</item>
     <item msgid="7433294150916905997">"صرف پلگ ان ہونے پر"</item>
     <item msgid="1390404486722375028">"کبھی نہیں"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"آخری 30 دن"</item>
+    <item msgid="6600989128423965319">"استعمال کا دور سیٹ کریں…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"خودکار"</item>
+    <item msgid="1013988753804838790">"خودکار"</item>
     <item msgid="6670588712989942178">"‏صرف ‎5 GHz"</item>
     <item msgid="2715516524973207876">"‏صرف ‎2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"استعمال کا وقت"</item>
-    <item msgid="3703676222230317933">"شروعات کی گنتی"</item>
+    <item msgid="4796160515314745154">"آخری بار استعمال کردہ"</item>
     <item msgid="2502754479975776899">"ایپ کا نام"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"الارم والیوم"</item>
     <item msgid="785049718065337473">"اطلاع کا والیوم"</item>
     <item msgid="6700305533746877052">"بلوٹوتھ والیوم"</item>
-    <item msgid="3810969981743709839">"مائیکروفون کی آواز خاموش کریں/چلائیں"</item>
-    <item msgid="2627903914574908209">"اسکرین آن رکھیں"</item>
-    <item msgid="1395372654968157578">"مقام پر نگاہ رکھیں"</item>
-    <item msgid="3238451051299611853">"اعلی قوت کے مقام پر نگاہ رکھیں"</item>
+    <item msgid="2029227495214047094">"اسکرین آن رکھیں"</item>
+    <item msgid="26109888160231211">"مقام پر نگاہ رکھیں"</item>
+    <item msgid="5753382310468855812">"اعلی قوت کے مقام پر نگاہ رکھیں"</item>
+    <item msgid="3356591542543137332">"استعمال کے اعداد و شمار حاصل کریں"</item>
+    <item msgid="3073734345226842233">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
+    <item msgid="1148142988678569310">"پروجیکٹ میڈیا"</item>
+    <item msgid="9130014005474445273">"‏VPN کو فعال کریں"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"مقام"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"الارم والیوم"</item>
     <item msgid="9103719301075748925">"اطلاع کا والیوم"</item>
     <item msgid="7025966722295861512">"بلوٹوتھ کا والیوم"</item>
-    <item msgid="2265317984004577529">"مائیکروفون کی آواز خاموش کریں/چلائیں"</item>
-    <item msgid="3646325683886507917">"اسکرین آن رکھیں"</item>
+    <item msgid="4665183401128289653">"بیدار رہیں"</item>
+    <item msgid="8584357129746649222">"مقام"</item>
     <item msgid="7669257279311110599">"مقام"</item>
-    <item msgid="7745724368696313169">"مقام"</item>
+    <item msgid="3459320345690097795">"استعمال کے اعداد و شمار حاصل کریں"</item>
+    <item msgid="1312534577834048535">"مائیکروفون کو خاموش کریں/اس کی آواز چلائیں"</item>
+    <item msgid="5906017727368097853">"پروجیکٹ میڈیا"</item>
+    <item msgid="2486614710846178542">"‏VPN کو فعال کریں"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"مختصر"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"ڈیفالٹ"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"‏Sans-serif گٹھا ہوا"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"مونو اسپیس"</item>
-    <item msgid="6857338041963571301">"غیر رسمی"</item>
-    <item msgid="961716102408512888">"خمیدہ"</item>
-    <item msgid="784581717183349567">"چھوٹے بڑے حروف"</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">"بڑے حروف چھوٹے سائز میں"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"بہت چھوٹا"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"‏64K فی لاگ بفر"</item>
     <item msgid="2822309747675758628">"‏256K فی لاگ بفر"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"کیش کی ہوئی (سرگرمی کلائنٹ)"</item>
     <item msgid="6652164677254579050">"کیش کی ہوئی (خالی)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"نیلگوں سبز"</item>
+    <item msgid="8332294763632946560">"نیلا"</item>
+    <item msgid="2023216417616991392">"گہرا نیلا"</item>
+    <item msgid="3170497246594232819">"جامنی"</item>
+    <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 af0ffd7..ecade25 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>
@@ -137,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>
@@ -156,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>
@@ -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">"ٹھیک ہے"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"جدید ترین بلوٹوتھ"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"بلوٹوتھ آن ہونے پر، آپ کا آلہ دیگر قریبی بلوٹوتھ آلات کے ساتھ مواصلت کر سکتا ہے۔"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"اسکین کریں"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"جدید ترین"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"ایپس دکھائیں"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"‏WiFi کی قوت دکھائیں"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"نیٹ ورک سے مربوط ہوں"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"نیٹ ورک یاد رکھیں"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"نیٹ ورک بھول جائیں"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"‏Wi-Fi کالنگ کی وضع"</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>
+    <item msgid="3132912693346866895">"‏صرف Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"آف"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"‏Wi-Fi ترجیحی (Wi-Fi دستیاب نہ ہونے پر ہی سیل نیٹ ورک کا استعمال کرتا ہے)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"‏سیلولر ترجیحی (سیل نیٹ ورک دستیاب نہ ہونے پر ہی Wi-Fi استعمال کرتا ہے)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"‏صرف 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"بیٹری کا اسٹیٹس"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"بیٹری کی سطح"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"‏یہ نیٹ ورکنگ سے متعلقہ سبھی ترتیبات کو فیکٹری ڈیفالٹس پر ترتیب دے دیگی، بشمول:\n\n"<li>"Wifi"</li>\n<li>"موبائل ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"ترتیبات دوبارہ ترتیب دیں"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس عمل کو لوٹا نہیں سکتے ہیں!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"ترتیبات دوبارہ ترتیب دیں"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"نیٹ ورک ترتیبات دوبارہ ترتیب دینے کی توثیق کرنے کیلئے آپ کو اپنا غیر مقفل کرنے کا پیٹرن ڈرا کرنے کی ضرورت ہے۔"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"دوبارہ ترتیب دیں؟"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"نیٹ ورک کی ترتیبات دوبارہ ترتیب دے دی گئیں"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"ایپس ایپلیکیشنز سسٹم ڈاؤن لوڈ کرتی ہیں"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">‏‎%d ایپس شرائط فراہم کرتی ہیں</item>
+      <item quantity="one">‏‎%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"سبھی ایپس پر ترجیحات کو ڈیفالٹس پر دوبارہ ترتیب دیں"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"سسٹم اور ڈاؤن لوڈ کردہ ایپس سمیت <xliff:g id="COUNT">%d</xliff:g> ایپس انسٹال ہوگئیں"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"جدید ترین"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"نامعلوم ایپ"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"پروفائل منتخب کریں"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/xml/quick_launch_settings.xml b/res/values-uz-rUZ-nokeys/strings.xml
similarity index 61%
copy from res/xml/quick_launch_settings.xml
copy to res/values-uz-rUZ-nokeys/strings.xml
index eb5585c..2365196 100644
--- a/res/xml/quick_launch_settings.xml
+++ b/res/values-uz-rUZ-nokeys/strings.xml
@@ -1,23 +1,20 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
+ -->
 
-<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>   
+<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">"Ilovalarni boshqarish"</string>
+</resources>
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz-rUZ/arrays.xml
index 736fe69..b4bda8a 100644
--- a/res/values-uz-rUZ/arrays.xml
+++ b/res/values-uz-rUZ/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Doimo"</item>
     <item msgid="844721238536786870">"Faqat quvvatlantirilayotganda"</item>
-    <item msgid="2990218920631468642">"Hech qachon (internetni tezlashtiradi)"</item>
+    <item msgid="1986753720941888596">"Hech qachon"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Doimo"</item>
     <item msgid="7433294150916905997">"Faqat quvvatlantirilayotganda"</item>
     <item msgid="1390404486722375028">"Hech qachon"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"So‘nggi 30 kun"</item>
+    <item msgid="6600989128423965319">"Internetdan foyd-sh davri…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Avto"</item>
+    <item msgid="1013988753804838790">"Avtomatik"</item>
     <item msgid="6670588712989942178">"faqat 5 GHz"</item>
     <item msgid="2715516524973207876">"faqat 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Sarf vaqti"</item>
-    <item msgid="3703676222230317933">"Ishga tushirish hisobi"</item>
+    <item msgid="4796160515314745154">"So‘nggi marta foydalanish"</item>
     <item msgid="2502754479975776899">"Ilova nomi"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"signal tovush balandligi"</item>
     <item msgid="785049718065337473">"xabarnoma tovush balandligi"</item>
     <item msgid="6700305533746877052">"bluetooth tovush balandligi"</item>
-    <item msgid="3810969981743709839">"mikrofonni o‘chirish/yoqish"</item>
-    <item msgid="2627903914574908209">"faol rejimda qolsin"</item>
-    <item msgid="1395372654968157578">"joylashuvni kuzatish"</item>
-    <item msgid="3238451051299611853">"joylashuvni aniqlashda batareya quvvatidan foydalanishni nazorat qilish"</item>
+    <item msgid="2029227495214047094">"uyg‘oq turish"</item>
+    <item msgid="26109888160231211">"joylashuvni kuzatish"</item>
+    <item msgid="5753382310468855812">"yuqori elektr kuchlanishga ega joylashuvlarni kuzatish"</item>
+    <item msgid="3356591542543137332">"foydalanish statistikasini ko‘rish"</item>
+    <item msgid="3073734345226842233">"mikrofonni o‘chirish/yoqish"</item>
+    <item msgid="1148142988678569310">"kontentni translatsiya qilish"</item>
+    <item msgid="9130014005474445273">"VPN tarmog‘ini faollashtirish"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Joylashuv"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Signal tovush balandligi"</item>
     <item msgid="9103719301075748925">"Xabarnoma tovush balandligi"</item>
     <item msgid="7025966722295861512">"Bluetooth tovush balandligi"</item>
-    <item msgid="2265317984004577529">"Mikrofonni o‘chirish/yoqish"</item>
-    <item msgid="3646325683886507917">"Faol rejimda qolsin"</item>
+    <item msgid="4665183401128289653">"Uyg‘oq turish"</item>
+    <item msgid="8584357129746649222">"Joylashuv"</item>
     <item msgid="7669257279311110599">"Joylashuv"</item>
-    <item msgid="7745724368696313169">"Joylashuv"</item>
+    <item msgid="3459320345690097795">"Foydalanish statistikasini ko‘rish"</item>
+    <item msgid="1312534577834048535">"Mikrofonni o‘chirish/yoqish"</item>
+    <item msgid="5906017727368097853">"Kontentni translatsiya qilish"</item>
+    <item msgid="2486614710846178542">"VPN tarmog‘ini faollashtirish"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Qisqa"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Standart"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Ixchamlashtirilgan Sans-serif"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Teng kenglik"</item>
-    <item msgid="6857338041963571301">"Tasodifiy"</item>
-    <item msgid="961716102408512888">"Kursiv"</item>
-    <item msgid="784581717183349567">"Kichiklashtirilgan katta harflar"</item>
+    <item msgid="7247838127505318669">"Sans-serif (bir xil oraliqli)"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif (bir xil oraliqli)"</item>
+    <item msgid="639503332147461010">"Norasmiy"</item>
+    <item msgid="7967169925231332424">"Qiya"</item>
+    <item msgid="561832997193039673">"Kichik bosh harflar"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Juda kichikina"</item>
@@ -375,6 +385,11 @@
     <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 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">"Bufer: maks. 64 KB"</item>
     <item msgid="2822309747675758628">"Bufer: maks. 256 KB"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Keshlangan (harakat mijozi)"</item>
     <item msgid="6652164677254579050">"Keshlangan (bo‘sh)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Moviy"</item>
+    <item msgid="8332294763632946560">"Havorang"</item>
+    <item msgid="2023216417616991392">"To‘q ko‘k"</item>
+    <item msgid="3170497246594232819">"Binafsharang"</item>
+    <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 0ffa696..cb6c7f6 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tekshirish"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Kengaytirilgan"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Ilovalarni ko‘r-sh"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"WiFi kuchini ko‘r-sh"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Tarmoqqa ulanish"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Tarmoqni eslab qolish"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Tarmoqni unutish"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi qo‘ng‘iroq rejimi"</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>
+    <item msgid="3132912693346866895">"Faqat Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"O‘chirilgan"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi afzal ko‘rilsin (Wi-Fi mavjud bo‘lmasa, mobil tarmoqdan foydalaniladi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Mobil tarmoq afzal ko‘rilsin (agar mobil tarmoq mavjud bo‘lmasa, Wi-Fi tarmog‘idan foydalaniladi)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Faqat Wi-Fi (Mobil tarmoqdan hech qachon foydalanilmaydi. Wi-Fi tarmoq mavjud bo‘lmasa, qo‘ng‘iroq qilib bo‘lmaydi va qo‘ng‘iroqlarni qabul qilib ham bo‘lmaydi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Batareya ahvoli"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batareya darajasi"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Bunda, tarmoqqa oid barcha sozlamalar dastlabki holatiga qaytariladi, jumladan:\n\n"<li>"Wi-Fi"</li>\n<li>"Mobil internet"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_button_text" msgid="2035676527471089853">"Sozlamalarni tiklash"</string>
+    <string name="reset_network_final_desc" msgid="1745138973574945389">"Barcha tarmoq sozlamalari tiklansinmi? Siz bu amalni ortga qaytara olmaysiz!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Sozlamalarni tiklash"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Tarmoq sozlamalarini tiklash buyrug‘ini tasdiqlash uchun chizmali parolni kiritishingiz lozim."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Tiklansinmi?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Tarmoq sozlamalarini tiklash"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"ilovalar yuklab olish tizim"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d ta ilova shart qo‘yadi</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Barcha ilovalarning sozlamalarini ilk holatga qaytarish"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> ta ilova o‘rnatilgan, jumladan, tizimga oid va yuklab olingan ilovalar"</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>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 1902cba..a14bb05 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Luôn luôn"</item>
     <item msgid="844721238536786870">"Chỉ khi cắm vào nguồn điện"</item>
-    <item msgid="2990218920631468642">"Không bao giờ (tăng mức sử dụng dữ liệu)"</item>
+    <item msgid="1986753720941888596">"Không bao giờ"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Luôn luôn"</item>
     <item msgid="7433294150916905997">"Chỉ khi cắm vào nguồn điện"</item>
     <item msgid="1390404486722375028">"Không bao giờ"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"30 ngày qua"</item>
+    <item msgid="6600989128423965319">"Đặt chu kỳ sử dụng..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Tự động"</item>
+    <item msgid="1013988753804838790">"Tự động"</item>
     <item msgid="6670588712989942178">"Chỉ 5 GHz"</item>
     <item msgid="2715516524973207876">"Chỉ 2,4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Thời gian sử dụng"</item>
-    <item msgid="3703676222230317933">"Số lần chạy"</item>
+    <item msgid="4796160515314745154">"Sử dụng lần cuối"</item>
     <item msgid="2502754479975776899">"Tên ứng dụng"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"âm lượng báo thức"</item>
     <item msgid="785049718065337473">"âm lượng thông báo"</item>
     <item msgid="6700305533746877052">"âm lượng bluetooth"</item>
-    <item msgid="3810969981743709839">"tắt/bật micrô"</item>
-    <item msgid="2627903914574908209">"không khóa màn hình"</item>
-    <item msgid="1395372654968157578">"theo dõi vị trí"</item>
-    <item msgid="3238451051299611853">"theo dõi vị trí dùng điện năng cao"</item>
+    <item msgid="2029227495214047094">"không khóa màn hình"</item>
+    <item msgid="26109888160231211">"giám sát vị trí"</item>
+    <item msgid="5753382310468855812">"theo dõi vị trí dùng điện năng cao"</item>
+    <item msgid="3356591542543137332">"tải thống kế sử dụng"</item>
+    <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>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Vị trí"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Âm lượng báo thức"</item>
     <item msgid="9103719301075748925">"Âm lượng thông báo"</item>
     <item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
-    <item msgid="2265317984004577529">"Tắt/bật micrô"</item>
-    <item msgid="3646325683886507917">"Không khóa màn hình"</item>
+    <item msgid="4665183401128289653">"Không khóa màn hình"</item>
+    <item msgid="8584357129746649222">"Vị trí"</item>
     <item msgid="7669257279311110599">"Vị trí"</item>
-    <item msgid="7745724368696313169">"Vị trí"</item>
+    <item msgid="3459320345690097795">"Tải thống kê sử dụng"</item>
+    <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>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Mặc định"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif mật độ cao"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"Đơn cách"</item>
-    <item msgid="6857338041963571301">"Thông thường"</item>
-    <item msgid="961716102408512888">"Chữ thảo"</item>
-    <item msgid="784581717183349567">"Chữ viết hoa nhỏ"</item>
+    <item msgid="7247838127505318669">"Giãn cách đơn Sans-serif"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Giãn cách đơn Serif"</item>
+    <item msgid="639503332147461010">"Thông thường"</item>
+    <item msgid="7967169925231332424">"Chữ thảo"</item>
+    <item msgid="561832997193039673">"Chữ viết hoa nhỏ"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Rất nhỏ"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K/lần tải nhật ký"</item>
     <item msgid="2822309747675758628">"256K/lần tải n.ký"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Được lưu trong bộ nhớ cache (máy khách hoạt động)"</item>
     <item msgid="6652164677254579050">"Được lưu trong bộ nhớ cache (trống)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Xanh két"</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 a2b0805..83fd73e 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Dò"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Nâng cao"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Hiển thị ứng dụng"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Hiển thị độ mạnh WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kết nối tới mạng"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Nhớ mạng"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Quên mạng"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Chế độ gọi qua Wi-Fi"</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>
+    <item msgid="3132912693346866895">"Chỉ Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Tắt"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Ưu tiên Wi-Fi (Chỉ sử dụng mạng di động nếu không có Wi-Fi)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Ưu tiên mạng di động (Chỉ sử dụng Wi-Fi nếu không có mạng di động)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"Chỉ Wi-Fi (Không bao giờ sử dụng mạng di động. Không thể nhận hoặc thực hiện cuộc gọi nếu không có Wi-Fi)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Tình trạng pin"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Mức pin"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"Điều này sẽ đặt lại tất cả các cài đặt liên quan đến mạng về mặc định ban đầu, bao gồm:\n\n"<li>"Wifi"</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="1745138973574945389">"Đặt lại tất cả cài đặt mạng? Bạn không thể hoàn nguyên tác vụ này!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Đặt lại cài đặt"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Bạn cần phải vẽ hình mở khóa của mình để xác nhận đặt lại cài đặt mạng."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Đặt lại?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Đã đặt lại cài đặt mạng"</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>
@@ -1107,6 +1109,8 @@
     <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="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_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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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>
@@ -1704,14 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,9 @@
     <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_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_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>
@@ -2418,29 +2435,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d ứng dụng cung cấp điều kiện</item>
+      <item quantity="one">%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>
@@ -2514,4 +2533,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Đặt lại tùy chọn trên tất cả các ứng dụng về mặc định"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"Đã cài đặt <xliff:g id="COUNT">%d</xliff:g> ứng dụng, bao gồm các ứng dụng đã tải xuống và ứng dụng hệ thống"</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>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 0b8e152..a9a0641 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -30,34 +30,34 @@
     <item msgid="8392017019801393511">"全部"</item>
   </string-array>
   <string-array name="screen_timeout_entries">
-    <item msgid="3342301044271143016">"15 秒"</item>
-    <item msgid="8881760709354815449">"30 秒"</item>
-    <item msgid="7589406073232279088">"1 分钟"</item>
-    <item msgid="7001195990902244174">"2 分钟"</item>
-    <item msgid="7489864775127957179">"5 分钟"</item>
-    <item msgid="2314124409517439288">"10 分钟"</item>
-    <item msgid="6864027152847611413">"30 分钟"</item>
+    <item msgid="3342301044271143016">"15秒"</item>
+    <item msgid="8881760709354815449">"30秒"</item>
+    <item msgid="7589406073232279088">"1分钟"</item>
+    <item msgid="7001195990902244174">"2分钟"</item>
+    <item msgid="7489864775127957179">"5分钟"</item>
+    <item msgid="2314124409517439288">"10分钟"</item>
+    <item msgid="6864027152847611413">"30分钟"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"永不"</item>
-    <item msgid="2194151041885903260">"15 秒"</item>
-    <item msgid="5892295237131074341">"30 秒"</item>
-    <item msgid="3538441365970038213">"1 分钟"</item>
-    <item msgid="412343871668955639">"2 分钟"</item>
-    <item msgid="5076853889688991690">"5 分钟"</item>
-    <item msgid="1903860996174927898">"10 分钟"</item>
-    <item msgid="6415509612413178727">"30 分钟"</item>
+    <item msgid="2194151041885903260">"15秒"</item>
+    <item msgid="5892295237131074341">"30秒"</item>
+    <item msgid="3538441365970038213">"1分钟"</item>
+    <item msgid="412343871668955639">"2分钟"</item>
+    <item msgid="5076853889688991690">"5分钟"</item>
+    <item msgid="1903860996174927898">"10分钟"</item>
+    <item msgid="6415509612413178727">"30分钟"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"立即"</item>
-    <item msgid="6736512735606834431">"5 秒"</item>
-    <item msgid="8044619388267891375">"15 秒"</item>
-    <item msgid="1822002388249545488">"30 秒"</item>
-    <item msgid="8538071621211916519">"1 分钟"</item>
-    <item msgid="5663439580228932882">"2 分钟"</item>
-    <item msgid="49888496216106852">"5 分钟"</item>
-    <item msgid="9002737361305019353">"10 分钟"</item>
-    <item msgid="4322676235684793329">"30 分钟"</item>
+    <item msgid="6736512735606834431">"5秒"</item>
+    <item msgid="8044619388267891375">"15秒"</item>
+    <item msgid="1822002388249545488">"30秒"</item>
+    <item msgid="8538071621211916519">"1分钟"</item>
+    <item msgid="5663439580228932882">"2分钟"</item>
+    <item msgid="49888496216106852">"5分钟"</item>
+    <item msgid="9002737361305019353">"10分钟"</item>
+    <item msgid="4322676235684793329">"30分钟"</item>
   </string-array>
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"小"</item>
@@ -88,7 +88,7 @@
     <item msgid="8934131797783724664">"正在扫描..."</item>
     <item msgid="8513729475867537913">"正在连接..."</item>
     <item msgid="515055375277271756">"正在进行身份验证..."</item>
-    <item msgid="1943354004029184381">"正在获取 IP 地址..."</item>
+    <item msgid="1943354004029184381">"正在获取IP地址..."</item>
     <item msgid="4221763391123233270">"已连接"</item>
     <item msgid="624838831631122137">"已暂停"</item>
     <item msgid="7979680559596111948">"正在断开连接..."</item>
@@ -102,7 +102,7 @@
     <item msgid="8878186979715711006">"正在扫描..."</item>
     <item msgid="355508996603873860">"正在连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
     <item msgid="554971459996405634">"正在通过 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 进行身份验证..."</item>
-    <item msgid="7928343808033020343">"正在从 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 获取 IP 地址..."</item>
+    <item msgid="7928343808033020343">"正在从<xliff:g id="NETWORK_NAME">%1$s</xliff:g>获取IP地址..."</item>
     <item msgid="8937994881315223448">"已连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
     <item msgid="1330262655415760617">"已暂停"</item>
     <item msgid="7698638434317271902">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -129,8 +128,8 @@
   </string-array>
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"按钮"</item>
-    <item msgid="1624323946324499595">"从对等设备获取的 PIN"</item>
-    <item msgid="5366790421523328066">"从此设备生成的 PIN"</item>
+    <item msgid="1624323946324499595">"从对等设备获取的PIN码"</item>
+    <item msgid="5366790421523328066">"此设备生成的PIN码"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"已连接"</item>
@@ -140,9 +139,9 @@
     <item msgid="2330782789550628803">"超出范围"</item>
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
-    <item msgid="8151962652413645395">"2 分钟"</item>
-    <item msgid="8675215713017289017">"5 分钟"</item>
-    <item msgid="477015974247590543">"1 小时"</item>
+    <item msgid="8151962652413645395">"2分钟"</item>
+    <item msgid="8675215713017289017">"5分钟"</item>
+    <item msgid="477015974247590543">"1小时"</item>
     <item msgid="5198271470953124739">"永不超时"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"始终"</item>
     <item msgid="844721238536786870">"仅限充电时"</item>
-    <item msgid="2990218920631468642">"永不（会增加数据网络流量）"</item>
+    <item msgid="1986753720941888596">"永不"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"始终"</item>
     <item msgid="7433294150916905997">"仅限充电时"</item>
     <item msgid="1390404486722375028">"永不"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"过去30天"</item>
+    <item msgid="6600989128423965319">"设置流量周期…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"自动"</item>
-    <item msgid="6670588712989942178">"仅使用 5 GHz 频带"</item>
-    <item msgid="2715516524973207876">"仅使用 2.4 GHz 频带"</item>
+    <item msgid="1013988753804838790">"自动"</item>
+    <item msgid="6670588712989942178">"仅使用5GHz频带"</item>
+    <item msgid="2715516524973207876">"仅使用2.4GHz频带"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"使用时间"</item>
-    <item msgid="3703676222230317933">"启动次数"</item>
+    <item msgid="4796160515314745154">"上次使用时间"</item>
     <item msgid="2502754479975776899">"应用名称"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -221,8 +224,8 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"设备内存"</item>
-    <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
+    <item msgid="8151497958991952759">"内部存储设备"</item>
+    <item msgid="3738430123799803530">"可卸载的SD卡"</item>
     <item msgid="4498124044785815005">"由系统确定"</item>
   </string-array>
   <string-array name="app_ops_categories">
@@ -243,7 +246,7 @@
     <item msgid="6546959730920410907">"修改通话记录"</item>
     <item msgid="446877710771379667">"读取日历"</item>
     <item msgid="7674458294386319722">"修改日历"</item>
-    <item msgid="8281201165558093009">"WLAN 扫描"</item>
+    <item msgid="8281201165558093009">"WLAN扫描"</item>
     <item msgid="8694611243479480497">"通知"</item>
     <item msgid="7776439107987345446">"手机网络扫描"</item>
     <item msgid="514615766544675057">"拨打电话"</item>
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"闹钟音量"</item>
     <item msgid="785049718065337473">"通知音量"</item>
     <item msgid="6700305533746877052">"蓝牙音量"</item>
-    <item msgid="3810969981743709839">"将麦克风静音或取消静音"</item>
-    <item msgid="2627903914574908209">"保持唤醒状态"</item>
-    <item msgid="1395372654968157578">"监控位置信息"</item>
-    <item msgid="3238451051299611853">"监控高电耗位置信息"</item>
+    <item msgid="2029227495214047094">"保持唤醒状态"</item>
+    <item msgid="26109888160231211">"监测位置"</item>
+    <item msgid="5753382310468855812">"监控高电耗位置信息服务"</item>
+    <item msgid="3356591542543137332">"获取使用情况统计信息"</item>
+    <item msgid="3073734345226842233">"将麦克风静音或取消静音"</item>
+    <item msgid="1148142988678569310">"投影媒体"</item>
+    <item msgid="9130014005474445273">"激活VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"闹钟音量"</item>
     <item msgid="9103719301075748925">"通知音量"</item>
     <item msgid="7025966722295861512">"蓝牙音量"</item>
-    <item msgid="2265317984004577529">"将麦克风静音或取消静音"</item>
-    <item msgid="3646325683886507917">"保持唤醒状态"</item>
+    <item msgid="4665183401128289653">"保持唤醒状态"</item>
+    <item msgid="8584357129746649222">"位置"</item>
     <item msgid="7669257279311110599">"位置信息"</item>
-    <item msgid="7745724368696313169">"位置信息"</item>
+    <item msgid="3459320345690097795">"获取使用情况统计信息"</item>
+    <item msgid="1312534577834048535">"将麦克风静音或取消静音"</item>
+    <item msgid="5906017727368097853">"投影媒体"</item>
+    <item msgid="2486614710846178542">"激活VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"默认"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"等宽"</item>
-    <item msgid="6857338041963571301">"随意"</item>
-    <item msgid="961716102408512888">"手写"</item>
-    <item msgid="784581717183349567">"小型大写字母"</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">"超小"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"每个日志缓冲区64K"</item>
     <item msgid="2822309747675758628">"每个日志缓冲区256K"</item>
@@ -453,10 +468,10 @@
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
-    <item msgid="4810006996171705398">"不得超过 1 个进程"</item>
-    <item msgid="8586370216857360863">"不得超过 2 个进程"</item>
-    <item msgid="836593137872605381">"不得超过 3 个进程"</item>
-    <item msgid="7899496259191969307">"不得超过 4 个进程"</item>
+    <item msgid="4810006996171705398">"不得超过1个进程"</item>
+    <item msgid="8586370216857360863">"不得超过2个进程"</item>
+    <item msgid="836593137872605381">"不得超过3个进程"</item>
+    <item msgid="7899496259191969307">"不得超过4个进程"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"已缓存（活动客户端）"</item>
     <item msgid="6652164677254579050">"已缓存（空）"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"青色"</item>
+    <item msgid="8332294763632946560">"蓝色"</item>
+    <item msgid="2023216417616991392">"靛青色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <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 095d9c3..ed1b565 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>
@@ -137,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>
@@ -156,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>
@@ -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">"确定"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"高级蓝牙设置"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"开启蓝牙后，您的设备可以与附近的其他蓝牙设备通信。"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN直连"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"显示应用"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"显示WLAN网络信号强度"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"连接到网络"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"记住网络"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"取消保存网络"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"WLAN 通话模式"</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>
+    <item msgid="3132912693346866895">"仅限 WLAN"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"关闭"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"首选 WLAN（只有 WLAN 不可用时才使用移动网络）"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"首选移动网络（只有移动网络不可用时才使用 WLAN）"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"仅限 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"电池电量"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"此操作会将与网络相关的所有设置重置为出厂默认设置，包括：\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="1745138973574945389">"要重置所有网络设置吗？重置后将无法撤消！"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"重置设置"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"您需要绘制解锁图案以确认要重置网络设置。"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"要重置网络设置吗？"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"网络设置已重置"</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>
@@ -1107,6 +1109,8 @@
     <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="788127681455735699">"使用 GPS 确定位置"</string>
+    <string name="location_menu_scanning" msgid="8536245838478802959">"扫描"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"扫描"</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>
@@ -1152,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1849,12 +1859,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>
@@ -2026,6 +2034,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>
@@ -2228,13 +2240,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>
@@ -2285,8 +2297,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>
@@ -2351,13 +2363,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>
@@ -2374,6 +2388,10 @@
     <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_all_apps" msgid="5377153522551809915">"应用 下载 应用程序 系统"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2418,29 +2436,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d 个应用可提供条件</item>
+      <item quantity="one">%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>
@@ -2514,4 +2534,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"将所有应用的偏好设置重置为默认设置"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"已安装 <xliff:g id="COUNT">%d</xliff:g> 个应用（包括系统和下载的应用）"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"高级"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"未知应用"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"选择个人资料"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 0d18937..8ef889e 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -85,7 +85,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"掃描中…"</item>
+    <item msgid="8934131797783724664">"掃瞄中…"</item>
     <item msgid="8513729475867537913">"正在連線..."</item>
     <item msgid="515055375277271756">"正在驗證…"</item>
     <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
@@ -99,7 +99,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"掃描中…"</item>
+    <item msgid="8878186979715711006">"掃瞄中…"</item>
     <item msgid="355508996603873860">"正在連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
     <item msgid="554971459996405634">"正在取得 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的授權…"</item>
     <item msgid="7928343808033020343">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -152,23 +151,27 @@
     <item msgid="5702329417707689835">"優"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
-    <item msgid="3269131034472904310">"一律"</item>
-    <item msgid="844721238536786870">"僅限連接電源時採用"</item>
-    <item msgid="2990218920631468642">"永不 (增加數據用量)"</item>
+    <item msgid="3269131034472904310">"永遠"</item>
+    <item msgid="844721238536786870">"只在充電時"</item>
+    <item msgid="1986753720941888596">"永不"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
-    <item msgid="2124319326282651391">"一律"</item>
-    <item msgid="7433294150916905997">"僅限連接電源時採用"</item>
+    <item msgid="2124319326282651391">"永遠"</item>
+    <item msgid="7433294150916905997">"只在充電時"</item>
     <item msgid="1390404486722375028">"永不"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"最近 30 天"</item>
+    <item msgid="6600989128423965319">"設定用量週期…"</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"自動"</item>
+    <item msgid="1013988753804838790">"自動"</item>
     <item msgid="6670588712989942178">"僅限 5 GHz"</item>
     <item msgid="2715516524973207876">"僅限 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"使用時間"</item>
-    <item msgid="3703676222230317933">"啟動計數"</item>
+    <item msgid="4796160515314745154">"上次使用時間"</item>
     <item msgid="2502754479975776899">"應用程式名稱"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"鬧鐘音量"</item>
     <item msgid="785049718065337473">"通知音量"</item>
     <item msgid="6700305533746877052">"藍牙音量"</item>
-    <item msgid="3810969981743709839">"關閉/開啟麥克風"</item>
-    <item msgid="2627903914574908209">"保持啟用"</item>
-    <item msgid="1395372654968157578">"監控位置"</item>
-    <item msgid="3238451051299611853">"監控高功率位置"</item>
+    <item msgid="2029227495214047094">"保持啟用"</item>
+    <item msgid="26109888160231211">"監測位置"</item>
+    <item msgid="5753382310468855812">"監控高耗電量定位功能"</item>
+    <item msgid="3356591542543137332">"取得使用統計資料"</item>
+    <item msgid="3073734345226842233">"關閉/開啟麥克風"</item>
+    <item msgid="1148142988678569310">"投影媒體"</item>
+    <item msgid="9130014005474445273">"啟用 VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"鬧鐘音量"</item>
     <item msgid="9103719301075748925">"通知音量"</item>
     <item msgid="7025966722295861512">"藍牙音量"</item>
-    <item msgid="2265317984004577529">"關閉/開啟麥克風"</item>
-    <item msgid="3646325683886507917">"保持啟用"</item>
+    <item msgid="4665183401128289653">"保持啟用"</item>
+    <item msgid="8584357129746649222">"位置"</item>
     <item msgid="7669257279311110599">"位置"</item>
-    <item msgid="7745724368696313169">"位置"</item>
+    <item msgid="3459320345690097795">"取得使用統計資料"</item>
+    <item msgid="1312534577834048535">"關閉/開啟麥克風"</item>
+    <item msgid="5906017727368097853">"投影媒體"</item>
+    <item msgid="2486614710846178542">"啟用 VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"預設"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"等寬"</item>
-    <item msgid="6857338041963571301">"休閒"</item>
-    <item msgid="961716102408512888">"草書"</item>
-    <item msgid="784581717183349567">"小楷"</item>
+    <item msgid="7247838127505318669">"Sans-serif 等寬字型"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif 等寬字型"</item>
+    <item msgid="639503332147461010">"行書"</item>
+    <item msgid="7967169925231332424">"草書"</item>
+    <item msgid="561832997193039673">"小楷"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"非常小"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"每個記錄緩衝區 64K"</item>
     <item msgid="2822309747675758628">"每個記錄緩衝區 256K"</item>
@@ -385,12 +400,12 @@
   <string-array name="hdcp_checking_titles">
     <item msgid="441827799230089869">"不要檢查"</item>
     <item msgid="6042769699089883931">"僅檢查 DRM 內容"</item>
-    <item msgid="9174900380056846820">"一律檢查"</item>
+    <item msgid="9174900380056846820">"永遠檢查"</item>
   </string-array>
   <string-array name="hdcp_checking_summaries">
     <item msgid="505558545611516707">"不使用 HDCP 檢查"</item>
     <item msgid="3878793616631049349">"僅使用 HDCP 檢查 DRM 內容"</item>
-    <item msgid="45075631231212732">"一律使用 HDCP 檢查"</item>
+    <item msgid="45075631231212732">"永遠使用 HDCP 檢查"</item>
   </string-array>
   <string-array name="window_animation_scale_entries">
     <item msgid="8134156599370824081">"關閉動畫"</item>
@@ -442,7 +457,7 @@
   </string-array>
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"關閉"</item>
-    <item msgid="2751513398307949636">"在屏幕上以列顯示"</item>
+    <item msgid="2751513398307949636">"在螢幕上以列顯示"</item>
     <item msgid="1851438178120770973">"在「adb shell dumpsys gfxinfo」指令中"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
@@ -477,7 +492,7 @@
   <string-array name="security_settings_premium_sms_values">
     <item msgid="7389829271787670252">"詢問"</item>
     <item msgid="5077768429488260031">"永不允許"</item>
-    <item msgid="1417929597727989746">"一律允許"</item>
+    <item msgid="1417929597727989746">"永遠允許"</item>
   </string-array>
   <string-array name="ram_states">
     <item msgid="7088762389498381203">"正常"</item>
@@ -509,7 +524,22 @@
     <item msgid="6782857406100845127">"首頁"</item>
     <item msgid="2860945127596974299">"最近活動"</item>
     <item msgid="8610560843693675830">"快取 (活動)"</item>
-    <item msgid="4338089220026248848">"快取 (活動用戶端)"</item>
+    <item msgid="4338089220026248848">"快取 (活動使用者端)"</item>
     <item msgid="6652164677254579050">"快取 (清空)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"藍綠色"</item>
+    <item msgid="8332294763632946560">"藍色"</item>
+    <item msgid="2023216417616991392">"靛藍色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <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 9b5f095..3110aaf 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>
@@ -137,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>
@@ -156,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>
@@ -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">"確定"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"當啟用藍牙功能後，您的裝置可以與其他附近的藍牙裝置通訊。"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"掃瞄"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階設定"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"顯示應用程式"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"顯示 WiFi 強度"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網絡"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"記住網絡"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"刪除網絡"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi 通話模式"</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>
+    <item msgid="3132912693346866895">"只限 Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"關閉"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"首選 Wi-Fi (只在無法使用 Wi-Fi 時使用流動網絡)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"首選流動數據 (只在無法使用流動網絡時使用 Wi-Fi)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"只限 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電量"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"這樣做會將所有與網絡相關的設定重設至出廠預設值，包括：\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="1745138973574945389">"要重設所有網絡設定嗎？這個操作不能復原！"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"您必須畫出解鎖圖案，確認重設網絡設定。"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"重設？"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"重設網絡設定"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1853,12 +1863,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>
@@ -2030,6 +2038,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>
@@ -2232,13 +2244,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>
@@ -2289,8 +2301,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>
@@ -2355,13 +2367,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>
@@ -2378,6 +2392,10 @@
     <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_all_apps" msgid="5377153522551809915">"應用程式 下載應用程式 系統"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2422,29 +2440,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d 個應用程式提供條件</item>
+      <item quantity="one">%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>
@@ -2518,4 +2538,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"重設所有應用程式的偏好設定至預設值"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"已安裝 <xliff:g id="COUNT">%d</xliff:g> 個應用程式，包括系統和已下載應用程式"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"不明應用程式"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 1b8ce9c..4b53e74 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"TLS"</item>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"永遠連線"</item>
     <item msgid="844721238536786870">"只在充電時連線"</item>
-    <item msgid="2990218920631468642">"一律不連線 (增加資料用量)"</item>
+    <item msgid="1986753720941888596">"永不"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"永遠連線"</item>
     <item msgid="7433294150916905997">"只在充電時連線"</item>
     <item msgid="1390404486722375028">"永不採用"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"最近 30 天"</item>
+    <item msgid="6600989128423965319">"設定用量週期..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"自動"</item>
+    <item msgid="1013988753804838790">"自動"</item>
     <item msgid="6670588712989942178">"僅限 5 GHz"</item>
     <item msgid="2715516524973207876">"僅限 2.4 GHz"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"使用時間"</item>
-    <item msgid="3703676222230317933">"啟動計數"</item>
+    <item msgid="4796160515314745154">"上次使用時間"</item>
     <item msgid="2502754479975776899">"應用程式名稱"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"鬧鐘音量"</item>
     <item msgid="785049718065337473">"通知音量"</item>
     <item msgid="6700305533746877052">"藍牙音量"</item>
-    <item msgid="3810969981743709839">"關閉/開啟麥克風"</item>
-    <item msgid="2627903914574908209">"停用休眠"</item>
-    <item msgid="1395372654968157578">"監控位置"</item>
-    <item msgid="3238451051299611853">"監控高耗電定位功能"</item>
+    <item msgid="2029227495214047094">"停用休眠"</item>
+    <item msgid="26109888160231211">"監控位置"</item>
+    <item msgid="5753382310468855812">"監控高耗電定位功能"</item>
+    <item msgid="3356591542543137332">"取得使用統計資料"</item>
+    <item msgid="3073734345226842233">"關閉/開啟麥克風"</item>
+    <item msgid="1148142988678569310">"投影媒體"</item>
+    <item msgid="9130014005474445273">"啟用 VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"位置"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"鬧鐘音量"</item>
     <item msgid="9103719301075748925">"通知音量"</item>
     <item msgid="7025966722295861512">"藍牙音量"</item>
-    <item msgid="2265317984004577529">"關閉/開啟麥克風"</item>
-    <item msgid="3646325683886507917">"停用休眠"</item>
+    <item msgid="4665183401128289653">"停用休眠"</item>
+    <item msgid="8584357129746649222">"定位"</item>
     <item msgid="7669257279311110599">"定位"</item>
-    <item msgid="7745724368696313169">"定位"</item>
+    <item msgid="3459320345690097795">"取得使用統計資料"</item>
+    <item msgid="1312534577834048535">"關閉/開啟麥克風"</item>
+    <item msgid="5906017727368097853">"投影媒體"</item>
+    <item msgid="2486614710846178542">"啟用 VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"預設"</item>
     <item msgid="1016452621833735880">"Sans-serif"</item>
     <item msgid="2496277987934654454">"Sans-serif condensed"</item>
-    <item msgid="4406003087391086325">"Serif"</item>
-    <item msgid="1558362802170124073">"等寬"</item>
-    <item msgid="6857338041963571301">"隨性"</item>
-    <item msgid="961716102408512888">"草寫"</item>
-    <item msgid="784581717183349567">"小型大寫字母"</item>
+    <item msgid="7247838127505318669">"Sans-serif 等寬字型"</item>
+    <item msgid="4478414822462359763">"Serif"</item>
+    <item msgid="7502451783483660829">"Serif 等寬字型"</item>
+    <item msgid="639503332147461010">"隨性"</item>
+    <item msgid="7967169925231332424">"草寫"</item>
+    <item msgid="561832997193039673">"小型大寫字母"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"非常小"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"每個紀錄緩衝區 64K"</item>
     <item msgid="2822309747675758628">"每個紀錄緩衝區 256K"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"快取 (活動用戶端)"</item>
     <item msgid="6652164677254579050">"快取 (清空)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"藍綠色"</item>
+    <item msgid="8332294763632946560">"藍色"</item>
+    <item msgid="2023216417616991392">"靛藍色"</item>
+    <item msgid="3170497246594232819">"紫色"</item>
+    <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 172c2da..c2e2980 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>
@@ -137,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>
@@ -156,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>
@@ -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">"確定"</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>
@@ -393,8 +405,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>
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"藍牙進階設定"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"開啟藍牙功能後，您的裝置即可與其他鄰近的藍牙裝置相互傳輸資料。"</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 +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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"掃描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"進階"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"顯示應用程式"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"顯示 WiFi 強度"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網路"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"記住這個網路"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"清除網路"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Wi-Fi 通話模式"</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>
+    <item msgid="3132912693346866895">"只限 Wi-Fi"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"關閉"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Wi-Fi 優先 (只會在無法使用 Wi-Fi 的情況下使用行動通訊網路)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"行動通訊優先 (只會在無法使用行動通訊網路的情況下使用 Wi-Fi)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"只限 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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池存量"</string>
@@ -1009,10 +1005,16 @@
     <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="5805796658276223307">"這會將所有與網路相關的設定恢復成原廠預設值，包括：\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="1745138973574945389">"您要重設所有的網路設定嗎？這個動作無法復原！"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"畫出解鎖圖形，確認要重設網路設定。"</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"您要重設嗎？"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"網路設定重設完成"</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>
@@ -1107,6 +1109,8 @@
     <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_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,7 +1156,7 @@
     <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="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>
@@ -1398,17 +1402,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>
@@ -1447,19 +1440,29 @@
     <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>
@@ -1563,6 +1566,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 +1708,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>
@@ -1750,7 +1760,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>
@@ -1853,12 +1863,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>
@@ -2030,6 +2038,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>
@@ -2232,13 +2244,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>
@@ -2289,8 +2301,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>
@@ -2355,13 +2367,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>
@@ -2378,6 +2392,10 @@
     <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_all_apps" msgid="5377153522551809915">"app 下載 應用程式 系統"</string>
+    <!-- no translation found for keywords_app_permissions (8677901415217188314) -->
+    <skip />
     <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>
@@ -2422,29 +2440,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="other">%d 個應用程式提供了條件</item>
+      <item quantity="one">%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>
@@ -2518,4 +2538,40 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"將所有應用程式的偏好設定重設為預設值"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"已安裝 <xliff:g id="COUNT">%d</xliff:g> 個應用程式，包括系統和下載的應用程式"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"進階"</string>
+    <string name="unknown_app" msgid="5275921288718717656">"不明的應用程式"</string>
+    <string name="choose_profile" msgid="8229363046053568878">"選擇設定檔"</string>
+    <!-- no translation found for app_permissions (4148222031991883874) -->
+    <skip />
+    <!-- no translation found for app_permissions_summary (2098173899436407221) -->
+    <skip />
+    <!-- no translation found for app_permissions_group_summary (2721303391744909000) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index e4b9744..b044015 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -34,7 +34,7 @@
     <item msgid="8881760709354815449">"30 amasekhondi"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
     <item msgid="7001195990902244174">"2 amaminithi"</item>
-    <item msgid="7489864775127957179">"amaminithii angu-5"</item>
+    <item msgid="7489864775127957179">"5 amaminithii"</item>
     <item msgid="2314124409517439288">"10 amaminithi"</item>
     <item msgid="6864027152847611413">"30 amaminithi"</item>
   </string-array>
@@ -120,7 +120,6 @@
     <!-- 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) -->
-    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"I-PEAP"</item>
     <item msgid="7981731051382306293">"i-TLS"</item>
@@ -141,7 +140,7 @@
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"2 amaminithi"</item>
-    <item msgid="8675215713017289017">"amaminithii angu-5"</item>
+    <item msgid="8675215713017289017">"5 amaminithii"</item>
     <item msgid="477015974247590543">"1 ihora"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
   </string-array>
@@ -154,21 +153,25 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Njalo"</item>
     <item msgid="844721238536786870">"Uma ixhunyiwe kuphela"</item>
-    <item msgid="2990218920631468642">"Akusoze (yenyusa ukusetshenziswa kwedatha)"</item>
+    <item msgid="1986753720941888596">"Akusoze"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Njalo"</item>
     <item msgid="7433294150916905997">"Uma ixhunyiwe kuphela"</item>
     <item msgid="1390404486722375028">"Akusoze"</item>
   </string-array>
+  <string-array name="data_usage_data_range">
+    <item msgid="5013973108901348144">"Izinsuku zokugcina ezingu-30"</item>
+    <item msgid="6600989128423965319">"Isetha umjikelezo wokusebenzisa..."</item>
+  </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Okuzenzakalelayo"</item>
+    <item msgid="1013988753804838790">"Okuzenzakalelayo"</item>
     <item msgid="6670588712989942178">"i-5 GHz kuphela"</item>
     <item msgid="2715516524973207876">"i-2.4 GHz kuphela"</item>
   </string-array>
   <string-array name="usage_stats_display_order_types">
     <item msgid="2100172576767439288">"Isikhathi sokusetshenziswa"</item>
-    <item msgid="3703676222230317933">"Qalisa ukubala"</item>
+    <item msgid="4796160515314745154">"Isikhathi sokugcina ukusetshenziswa"</item>
     <item msgid="2502754479975776899">"Igama lohlelo lokusebenza"</item>
   </string-array>
   <string-array name="wifi_eap_entries">
@@ -273,10 +276,13 @@
     <item msgid="5762123934816216821">"ivolumu ye-alamu"</item>
     <item msgid="785049718065337473">"ivolumu yesaziso"</item>
     <item msgid="6700305533746877052">"ivolumu ye-bluetooth"</item>
-    <item msgid="3810969981743709839">"thulisa/yekisa ukuthulisa imakrofoni"</item>
-    <item msgid="2627903914574908209">"gcina kuphapheme"</item>
-    <item msgid="1395372654968157578">"qaphela indawo"</item>
-    <item msgid="3238451051299611853">"qapha indawo yamandla aphezulu"</item>
+    <item msgid="2029227495214047094">"gcina kuphapheme"</item>
+    <item msgid="26109888160231211">"ngamela indawo"</item>
+    <item msgid="5753382310468855812">"yongamela indawo yamandla aphezulu"</item>
+    <item msgid="3356591542543137332">"thola izibalo zokusebenzisa"</item>
+    <item msgid="3073734345226842233">"thulisa/yekisa ukuthulisa imakrofoni"</item>
+    <item msgid="1148142988678569310">"imidiya yephrojekthi"</item>
+    <item msgid="9130014005474445273">"sebenzisa i-VPN"</item>
   </string-array>
   <string-array name="app_ops_labels">
     <item msgid="6602854600289714121">"Indawo"</item>
@@ -319,10 +325,13 @@
     <item msgid="7260546305036218513">"Ivolumu ye-alamu"</item>
     <item msgid="9103719301075748925">"Ivolumu yesaziso"</item>
     <item msgid="7025966722295861512">"Ivolumu ye-Bluetooth"</item>
-    <item msgid="2265317984004577529">"Thulisa/yekisa ukuthulisa imakrofoni"</item>
-    <item msgid="3646325683886507917">"Gcina kuphapheme"</item>
+    <item msgid="4665183401128289653">"Gcina kuphapheme"</item>
+    <item msgid="8584357129746649222">"Indawo"</item>
     <item msgid="7669257279311110599">"Indawo"</item>
-    <item msgid="7745724368696313169">"Indawo"</item>
+    <item msgid="3459320345690097795">"Thola izibalo zokusebenzisa"</item>
+    <item msgid="1312534577834048535">"Thulisa/yekisa ukuthulisa imakrofoni"</item>
+    <item msgid="5906017727368097853">"Imidiya yephrojekthi"</item>
+    <item msgid="2486614710846178542">"Sebenzisa i-VPN"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
@@ -333,11 +342,12 @@
     <item msgid="1319652728542138112">"Okuzenzakalelayo"</item>
     <item msgid="1016452621833735880">"I-Sans Serif"</item>
     <item msgid="2496277987934654454">"I-Sans-serif ejiyisiwe"</item>
-    <item msgid="4406003087391086325">"I-Serif"</item>
-    <item msgid="1558362802170124073">"I-Monospace"</item>
-    <item msgid="6857338041963571301">"Okuvamile"</item>
-    <item msgid="961716102408512888">"I-Cursive"</item>
-    <item msgid="784581717183349567">"Osonhlamvukazi abancane"</item>
+    <item msgid="7247838127505318669">"Sans-serif monospace"</item>
+    <item msgid="4478414822462359763">"I-Serif"</item>
+    <item msgid="7502451783483660829">"I-Serif monospace"</item>
+    <item msgid="639503332147461010">"Okuvamile"</item>
+    <item msgid="7967169925231332424">"Ngokutshekile"</item>
+    <item msgid="561832997193039673">"Izinhlamvukazi ezincane"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Kuncane kakhulu"</item>
@@ -375,6 +385,11 @@
     <item msgid="6405203239560695266">"4M"</item>
     <item msgid="3025431211013424097">"16M"</item>
   </string-array>
+  <string-array name="select_logd_size_lowram_titles">
+    <item msgid="524799395770610154">"64K"</item>
+    <item msgid="3534782711045262344">"256K"</item>
+    <item msgid="8085867209202153403">"1M"</item>
+  </string-array>
   <string-array name="select_logd_size_summaries">
     <item msgid="7346595473588765019">"64K ngebhafa yelogu ngayinye"</item>
     <item msgid="2822309747675758628">"256K ngebhafa yelogu ngayinye"</item>
@@ -512,4 +527,19 @@
     <item msgid="4338089220026248848">"Kulondoloziwe (iklayenti lomsebenzi)"</item>
     <item msgid="6652164677254579050">"Kulondoloziwe (lutho)"</item>
   </string-array>
+  <string-array name="color_picker">
+    <item msgid="7631642672260600032">"Okuluhlaza ngokujiyile"</item>
+    <item msgid="8332294763632946560">"Okuluhlaza okwesibhakabhaka"</item>
+    <item msgid="2023216417616991392">"I-Indigo"</item>
+    <item msgid="3170497246594232819">"Phephuli"</item>
+    <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 0abd9b3..09a151f 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>
@@ -137,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>
@@ -156,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>
@@ -327,9 +318,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>
@@ -350,6 +338,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>
@@ -393,8 +405,6 @@
     <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>
@@ -405,7 +415,6 @@
     <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>
@@ -429,30 +438,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>
@@ -482,15 +491,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>
@@ -518,15 +520,6 @@
     <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="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>
@@ -539,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>
@@ -595,15 +575,11 @@
     <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>
@@ -626,6 +602,8 @@
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"I-Wi-Fi eqondile"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skena"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Thuthukisiwe"</string>
+    <string name="wifi_menu_apps" msgid="6003687912727859577">"Bonisa Izinhlelo Zokusebenza"</string>
+    <string name="wifi_menu_apps_strength" msgid="3322614241441509660">"Bonisa Amandla we-WiFi"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Khumbula inethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
@@ -641,7 +619,7 @@
     <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>
@@ -667,20 +645,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>
@@ -753,6 +726,23 @@
     <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="3208568886184788972">"Imodi yokushaya ye-Wi-Fi"</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>
+    <item msgid="3132912693346866895">"I-Wi-Fi kuphela"</item>
+  </string-array>
+  <string-array name="wifi_calling_mode_values">
+    <item msgid="4799585830102342375">"2"</item>
+    <item msgid="1171822231056612021">"1"</item>
+    <item msgid="3194458950573886239">"0"</item>
+  </string-array>
+    <string name="wifi_calling_off_summary" msgid="1973102843796728910">"Valiwe"</string>
+    <string name="wfc_mode_wifi_preferred_summary" msgid="2538605598404726187">"Kuncanyelwa i-Wi-Fi (Isebenzisa inethiwekhi yeselula kuphela uma ngabe i-Wi-Fi ingatholakali)"</string>
+    <string name="wfc_mode_cellular_preferred_summary" msgid="3409009182901031134">"Kuncanyelwa iselula (Isebenzisa i-Wi-Fi kuphela uma ngabe inethiwekhi yeselula ingatholakali)"</string>
+    <string name="wfc_mode_wifi_only_summary" msgid="6783204292010626433">"I-Wi-Fi kuphela (Ayilokothi isebenzise inethiwekhi yeselula. Ayikwazi ukwenza noma ukuthola amakholi uma ngabe i-Wi-Fi ingatholakali)"</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>
@@ -816,6 +806,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>
@@ -867,10 +862,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>
@@ -964,7 +959,8 @@
     <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="battery_status_title" msgid="9159414319574976203">"Umumo webhetri"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Izinga lebhetri"</string>
@@ -1010,10 +1006,16 @@
     <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="5805796658276223307">"Lokhu kuzosetha kabusha izilungiselelo ezihlobene nokunethiwekha kokuzenzakalelayo kwasekuqaleni, okufaka:\n\n"<li>"i-Wifi"</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="1745138973574945389">"Setha kabusha zonke izilungiselelo zenethiwekhi? Awukwazi ukuguqula lesi senzo!"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Setha kabusha izilungiselelo"</string>
+    <string name="reset_network_gesture_explanation" msgid="8615374120762720549">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukusetha kabusha kwezilungiselelo zenethiwekhi."</string>
+    <string name="reset_network_confirm_title" msgid="1759888886976962773">"Setha kabusha?"</string>
+    <string name="reset_network_complete_toast" msgid="6898753798089969372">"Ukusetha kabusha kwezilungiselelo zenethiwekhi"</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>
@@ -1108,6 +1110,8 @@
     <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="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_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>
@@ -1153,7 +1157,7 @@
     <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="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>
@@ -1405,17 +1409,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>
@@ -1454,19 +1447,29 @@
     <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>
@@ -1570,6 +1573,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>
@@ -1711,14 +1715,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>
@@ -1757,7 +1767,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>
@@ -1856,12 +1866,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>
@@ -2033,6 +2041,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>
@@ -2235,13 +2247,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>
@@ -2292,8 +2304,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>
@@ -2358,13 +2370,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>
@@ -2381,6 +2395,9 @@
     <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_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_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>
@@ -2425,29 +2442,31 @@
     <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>
+    <plurals name="manage_condition_providers_summary_nonzero" formatted="false" msgid="1398308139164964218">
+      <item quantity="one">%d izinhlelo zokusebenza zinikeza ngezimo</item>
+      <item quantity="other">%d izinhlelo zokusebenza zinikeza 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>
@@ -2521,4 +2540,37 @@
     <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="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>
+    <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="reset_app_preferences_description" msgid="7718912868244058770">"Setha kabusha izintandokazi kuzo zonke izinhlelo zokusebenza kwezizenzakalelayo"</string>
+    <string name="all_apps_summary" msgid="3754827293203127282">"<xliff:g id="COUNT">%d</xliff:g> izinhlelo zokusebenza ezifakiwe, kufaka phakathi isistimu nezinhlelo zokusebenza ezilandekayo"</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>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f0462f3..a0afbc3 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1260,4 +1260,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/colors.xml b/res/values/colors.xml
index 70fc4a0..97ba2ed 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -51,29 +51,25 @@
     <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="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="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>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 339a2e4..580ae22 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -58,6 +58,7 @@
     <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_margin_top">24dp</dimen>
     <dimen name="setup_wizard_title_area_elevation">3dp</dimen>
 
     <dimen name="divider_height">3dip</dimen>
@@ -72,9 +73,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>
@@ -213,7 +212,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 +231,11 @@
     <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>
+
 </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 6af190d..3eaf38d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -285,26 +285,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 +308,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>
@@ -678,7 +660,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] -->
@@ -686,7 +668,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]  -->
@@ -723,13 +705,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 -->
@@ -771,6 +746,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>
 
@@ -943,11 +970,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] -->
@@ -973,8 +995,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] -->
@@ -1159,27 +1179,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,25 +1243,6 @@
     <!-- 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.  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] -->
@@ -1284,40 +1269,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 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.  Dock Setting Title -->
     <string name="bluetooth_dock_settings">Dock Settings</string>
     <!-- Bluetooth settings.  Dock Setting Dialog Title -->
@@ -1331,11 +1287,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>
 
     <!-- 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]-->
@@ -1436,8 +1390,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]-->
@@ -1448,12 +1400,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] -->
@@ -1496,6 +1442,10 @@
     <string name="wifi_menu_scan">Scan</string>
     <!-- Menu option to Wi-Fi advanced settings -->
     <string name="wifi_menu_advanced">Advanced</string>
+    <!-- Menu option to show app icons instead of WiFi strength [CHAR LIMIT=20]-->
+    <string name="wifi_menu_apps">Show Apps</string>
+    <!-- Menu option to show WiFi strength icons [CHAR LIMIT=20]-->
+    <string name="wifi_menu_apps_strength">Show WiFi Strength</string>
     <!-- Menu option to connect to a Wi-Fi network -->
     <string name="wifi_menu_connect">Connect to network</string>
     <!-- Menu option to remember a temporary Wi-Fi network -->
@@ -1529,7 +1479,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] -->
@@ -1582,27 +1532,18 @@
     <string name="wifi_password">Password</string>
     <!-- Label for the check box to show password -->
     <string name="wifi_show_password">Show password</string>
+    <!-- Label for the RadioGroup to choose wifi ap band -->
+    <string name="wifi_ap_band_config">Config AP Band</string>
+    <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+    <string name="wifi_ap_choose_2G">2.4 GHz Band</string>
+    <!-- Label for the radio button to choose wifi ap 5GHz band -->
+    <string name="wifi_ap_choose_5G">5 GHz Band</string>
     <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
     <string name="wifi_ip_settings">IP settings</string>
     <!-- Hint for unchanged fields -->
     <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>
@@ -1612,35 +1553,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>
@@ -1884,6 +1796,25 @@
          Label on Wifi Configuration screen-->
     <string name="config_list_label" translatable="false">Configured networks</string>
 
+    <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+    <string name="wifi_calling_settings_title">Wi-Fi calling</string>
+    <!-- WFC mode [CHAR LIMIT=30] -->
+    <string name="wifi_calling_mode_title">Calling preference</string>
+    <!-- WFC mode dialog [CHAR LIMIT=30] -->
+    <string name="wifi_calling_mode_dialog_title">Wi-Fi calling mode</string>
+    <string-array name="wifi_calling_mode_choices">
+        <item>Wi-Fi preferred</item>
+        <item>Cellular preferred</item>
+        <item>Wi-Fi only</item>
+    </string-array>
+    <string-array name="wifi_calling_mode_values">
+        <item>"2"</item>
+        <item>"1"</item>
+        <item>"0"</item>
+    </string-array>
+    <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+    <string name="wifi_calling_off_explanation">When Wi-Fi calling is on, your phone can route calls via Wi-Fi networks or your carrier\'s network, depending on your preference and which signal is stronger. Before turning on this feature, check with your carrier regarding fees and other details.</string>
+
     <!-- Sound and alerts settings -->
     <skip/>
     <!-- Main Settings screen setting option name to go into the display settings screen -->
@@ -2019,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] -->
@@ -2334,10 +2275,12 @@
     <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>
@@ -2429,15 +2372,29 @@
     <!-- 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 settings related to networking to the factory defaults, including:\n\n<li>Wifi</li>\n<li>Mobile 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 reverse 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>
+    <!-- Explanation of drawing unlock pattern to reset settings -->
+    <string name="reset_network_gesture_explanation">You need to draw your unlock pattern to confirm a network settings reset.</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 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] -->
@@ -2640,6 +2597,21 @@
     <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 [DO NOT TRANSLATE] -->
+    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning always available</string>
+    <!-- Preference description text for Wi-Fi always scanning [DO NOT TRANSLATE] -->
+    <string name="location_scanning_wifi_always_scanning_description">The clear history button in
+        your browser has saved more lives than Superman</string>
+    <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning [DO NOT TRANSLATE] -->
+    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning always available</string>
+    <!-- Description text for Bluetooth always scanning [DO NOT TRANSLATE] -->
+    <string name="location_scanning_bluetooth_always_scanning_description">If you want to catch a
+        squirrel just climb a tree and act like a nut</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>
@@ -2745,7 +2717,7 @@
 
     <!-- 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 -->
@@ -2912,6 +2884,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">Default 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. -->
@@ -2951,7 +2925,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>
@@ -3315,29 +3289,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 -->
@@ -3417,6 +3368,21 @@
     <string name="confirm_enable_oem_unlock_text">WARNING: Device protection features will not work on this device while this setting is turned on.</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>
+    <!-- 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 -->
+
+    <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+    <string name="debug_networking_category">Networking</string>
+
     <!-- Setting Checkbox title whether to show options for wireless display certification -->
     <string name="wifi_display_certification">Wireless display certification</string>
     <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
@@ -3425,6 +3391,9 @@
     <string name="wifi_aggressive_handover">Aggressive Wi\u2011Fi to Cellular handover</string>
     <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
     <string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>
+    <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+    <string name="legacy_dhcp_client">Use legacy DHCP client</string>
+
     <!-- setting Checkbox summary whether to show options for wireless display certification  -->
     <string name="wifi_display_certification_summary">Show options for wireless display certification</string>
     <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
@@ -3437,6 +3406,10 @@
     <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  -->
@@ -3444,6 +3417,8 @@
     <!-- 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>
@@ -3689,6 +3664,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"
@@ -4059,9 +4039,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 -->
@@ -4071,12 +4053,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 -->
@@ -4173,7 +4167,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 -->
@@ -4396,8 +4390,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 -->
@@ -4406,8 +4398,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>
@@ -4857,6 +4847,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>
 
@@ -5307,19 +5305,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>
@@ -5466,10 +5464,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>
@@ -5608,13 +5606,16 @@
     <string name="keywords_wifi">wifi wi-fi network connection</string>
     <string name="keywords_more_default_sms_app">text message texting messages messaging</string>
     <string name="keywords_more_mobile_networks">cellular cell carrier wireless data 4g 3g 2g lte</string>
+    <string name="keywords_wifi_calling">wifi wi-fi call calling</string>
     <string name="keywords_home">launcher</string>
     <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>
@@ -5631,6 +5632,10 @@
     <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_all_apps">apps download applications system</string>
+    <string name="keywords_app_permissions">apps permissions security</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>
 
@@ -5820,22 +5825,28 @@
     <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>
@@ -6050,4 +6061,85 @@
    <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>
+
+   <!-- 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>
+
+   <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+   <string name="notifications_enabled">On</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>
+
+    <!-- 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>
+
+    <!-- Description for advanced menu option to reset app preferences [CHAR LIMIT=NONE] -->
+    <string name="reset_app_preferences_description">Reset preferences across all apps to defaults</string>
+
+    <!-- Description of settings item that leads to list of all apps
+         [CHAR LIMIT=NONE] -->
+    <string name="all_apps_summary"><xliff:g id="count" example="10">%d</xliff:g> apps installed, including system and downloaded apps</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>
+
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 626fc27..8d0b885 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -83,7 +83,6 @@
     </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>
@@ -187,6 +186,9 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="TextAppearance.SetupWizardDescription" parent="@android:style/TextAppearance.Material.Subhead">
+    </style>
+
     <style name="SetupAddWifiNetwork">
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:gravity">start|center_vertical</item>
@@ -243,6 +245,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 +306,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 +323,31 @@
         <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>
-
-    <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>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 18cc40e..48c5457 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -126,7 +126,7 @@
         <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 +137,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 +154,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 +175,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 +190,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>
diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
new file mode 100644
index 0000000..2bbd5be
--- /dev/null
+++ b/res/xml/advanced_apps.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"
+    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:key="applications_settings">
+
+    <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="all_apps"
+        android:fragment="com.android.settings.applications.ManageApplications"
+        android:title="@string/filter_all_apps"
+        settings:keywords="@string/keywords_all_apps">
+        <extra
+            android:name="classname"
+            android:value="com.android.settings.Settings$AllApplicationsActivity" />
+    </PreferenceScreen>
+
+    <Preference
+        android:key="reset_all"
+        android:title="@string/reset_app_preferences"
+        android:summary="@string/reset_app_preferences_description"
+        settings:keywords="@string/keywords_reset_apps" />
+
+    <com.android.settings.applications.DefaultEmergencyPreference
+        android:key="default_emergency_app"
+        android:title="@string/default_emergency_app"
+        settings:keywords="@string/keywords_emergency_app" />
+
+</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..0d8c1ac 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 -->
@@ -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/development_prefs.xml b/res/xml/development_prefs.xml
index f31d556..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">
 
@@ -103,6 +109,18 @@
             android:title="@string/verify_apps_over_usb_title"
             android:summary="@string/verify_apps_over_usb_summary"/>
 
+        <ListPreference
+            android:key="select_logd_size"
+            android:title="@string/select_logd_size_title"
+            android:dialogTitle="@string/select_logd_size_dialog_title"
+            android:entries="@array/select_logd_size_titles"
+            android:entryValues="@array/select_logd_size_values" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:key="debug_networking_category"
+            android:title="@string/debug_networking_category">
+
         <SwitchPreference
             android:key="wifi_display_certification"
             android:title="@string/wifi_display_certification"
@@ -123,12 +141,17 @@
             android:title="@string/wifi_allow_scan_with_traffic" />
             android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
 
+       <SwitchPreference
+            android:key="legacy_dhcp_client"
+            android:title="@string/legacy_dhcp_client" />
+            android:summary="@string/legacy_dhcp_client_summary"/>
+
         <ListPreference
-            android:key="select_logd_size"
-            android:title="@string/select_logd_size_title"
-            android:dialogTitle="@string/select_logd_size_dialog_title"
-            android:entries="@array/select_logd_size_titles"
-            android:entryValues="@array/select_logd_size_values" />
+            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>
 
@@ -193,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/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..09f5bb3
--- /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/notification_section_header"
+        android:selectable="true" />
+
+    <Preference
+        android:key="preferred_settings"
+        android:title="@string/launch_by_default"
+        android:selectable="true" />
+</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..f35d248 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -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_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_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/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..1fc1cda 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"
diff --git a/res/xml/wifi_calling_settings.xml b/res/xml/wifi_calling_settings.xml
new file mode 100644
index 0000000..ca4e560
--- /dev/null
+++ b/res/xml/wifi_calling_settings.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.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  android:key="wifi_calling_settings"
+                  android:title="@string/wifi_calling_settings_title">
+
+    <ListPreference
+            android:key="wifi_calling_mode"
+            android:title="@string/wifi_calling_mode_title"
+            android:summary="@string/wifi_calling_mode_title"
+            android:entries="@array/wifi_calling_mode_choices"
+            android:entryValues="@array/wifi_calling_mode_values"
+            android:dialogTitle="@string/wifi_calling_mode_dialog_title" />
+
+</PreferenceScreen>
diff --git a/res/xml/wireless_settings.xml b/res/xml/wireless_settings.xml
index a5f722b..b615c9e 100644
--- a/res/xml/wireless_settings.xml
+++ b/res/xml/wireless_settings.xml
@@ -38,6 +38,12 @@
         android:persistent="false" />
 
     <PreferenceScreen
+        android:key="wifi_calling_settings"
+        android:title="@string/wifi_calling_settings_title"
+        settings:keywords="@string/keywords_wifi_calling"
+        android:fragment="com.android.settings.WifiCallingSettings" />
+
+    <PreferenceScreen
         android:fragment="com.android.settings.nfc.AndroidBeam"
         android:key="android_beam_settings"
         android:title="@string/android_beam_settings_title" />
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 7514565..3ac4eef 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -20,7 +20,7 @@
     android:title="@string/zen_mode_settings_title" >
 
     <!-- When calls and notifications arrive -->
-    <com.android.settings.notification.DropDownPreference
+    <com.android.settings.DropDownPreference
             android:key="zen_mode"
             android:title="@string/zen_mode_option_title"
             android:persistent="false" />
@@ -50,7 +50,7 @@
             android:switchTextOff=""
             android:switchTextOn="" />
 
-        <com.android.settings.notification.DropDownPreference
+        <com.android.settings.DropDownPreference
                 android:key="starred"
                 android:title="@string/zen_mode_from"
                 android:persistent="false" />
@@ -79,7 +79,7 @@
         <!-- Start time/End time added and removed here! :-) -->
 
         <!-- Interruptions allowed -->
-        <com.android.settings.notification.DropDownPreference
+        <com.android.settings.DropDownPreference
                 android:key="downtime_mode"
                 android:title="@string/zen_mode_downtime_mode_title"
                 android:order="100"
@@ -103,4 +103,4 @@
 
     </PreferenceCategory>
 
-</PreferenceScreen>
\ No newline at end of file
+</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/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..68cfb60 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();
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/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..cb0ce5f 100644
--- a/src/com/android/settings/ChooseLockGeneric.java
+++ b/src/com/android/settings/ChooseLockGeneric.java
@@ -23,7 +23,6 @@
 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;
@@ -35,15 +34,15 @@
 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;
@@ -72,44 +71,59 @@
     }
 
     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 mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
-        private boolean mFinishPending = false;
         private int mEncryptionRequestQuality;
         private boolean mEncryptionRequestDisabled;
         private boolean mRequirePassword;
         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());
@@ -125,7 +139,6 @@
             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);
@@ -146,15 +159,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();
@@ -195,36 +199,20 @@
         }
 
         @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;
                 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 +225,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 +235,23 @@
             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);
                 updatePreferenceSummaryIfNeeded();
             } else {
                 updateUnlockMethodAndFinish(quality, false);
             }
         }
 
-        /** increases the quality if necessary, and returns whether biometric is allowed */
-        private int upgradeQuality(int quality, MutableBoolean allowBiometric) {
+        /** increases the quality if necessary */
+        private int upgradeQuality(int quality) {
             quality = upgradeQualityForDPM(quality);
             quality = upgradeQualityForKeyStore(quality);
             return quality;
@@ -292,28 +280,23 @@
          * 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);
@@ -331,10 +314,6 @@
                         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)) {
@@ -345,7 +324,7 @@
                     if (hideDisabled) {
                         visible = 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,46 +360,16 @@
             }
         }
 
-        /**
-         * 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 getLockPatternIntent(Context context, final boolean requirePassword,
+                final boolean confirmCredentials) {
+            return ChooseLockPattern.createIntent(context, requirePassword,
                     confirmCredentials);
         }
 
@@ -444,10 +393,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 +402,36 @@
                     minLength = MIN_PASSWORD_LENGTH;
                 }
                 final int maxLength = mDPM.getPasswordMaximumLength(quality);
-                Intent intent = getLockPasswordIntent(context, quality, isFallback, minLength,
+                Intent intent = getLockPasswordIntent(context, quality, minLength,
                         maxLength, mRequirePassword,  /* confirm credentials */false);
-                if (isFallback) {
-                    startActivityForResult(intent, FALLBACK_REQUEST);
-                    return;
-                } else {
-                    mFinishPending = true;
-                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                    startActivity(intent);
-                }
+                startActivityForResult(intent, CHOOSE_LOCK_REQUEST);
             } else if (quality == DevicePolicyManager.PASSWORD_QUALITY_SOMETHING) {
-                Intent intent = getLockPatternIntent(context, isFallback, mRequirePassword,
+                Intent intent = getLockPatternIntent(context, mRequirePassword,
                         /* confirm credentials */false);
-                if (isFallback) {
-                    startActivityForResult(intent, FALLBACK_REQUEST);
-                    return;
-                } else {
-                    mFinishPending = true;
-                    intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                    startActivity(intent);
-                }
-            } 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 +467,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..6d7b71d 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,7 +72,6 @@
         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;
     }
@@ -97,12 +97,12 @@
         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 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 +179,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());
@@ -263,6 +264,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_PASSWORD;
+        }
+
+        @Override
         public void onResume() {
             super.onResume();
             updateStage(mUiStage);
@@ -431,14 +437,11 @@
                 }
             } 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);
+                    mLockPatternUtils.saveLockPassword(pin, mRequestedQuality);
                     getActivity().setResult(RESULT_FINISHED);
                     getActivity().finish();
                     mDone = true;
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index 38f908e..1865a6b 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,12 +68,11 @@
         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;
     }
@@ -104,7 +102,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;
@@ -208,6 +206,11 @@
                 }
          };
 
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CHOOSE_LOCK_PATTERN;
+        }
+
 
         /**
          * The states of the left footer button.
@@ -563,16 +566,12 @@
             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);
 
             if (lockVirgin) {
                 utils.setVisiblePatternEnabled(true);
diff --git a/src/com/android/settings/ChooseLockSettingsHelper.java b/src/com/android/settings/ChooseLockSettingsHelper.java
index 3086a7a..bba45ce 100644
--- a/src/com/android/settings/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/ChooseLockSettingsHelper.java
@@ -95,7 +95,7 @@
      */
     private boolean confirmPattern(int request, CharSequence message,
                                    CharSequence details, boolean returnCredentials) {
-        if (!mLockPatternUtils.isLockPatternEnabled() || !mLockPatternUtils.savedPatternExists()) {
+        if (!mLockPatternUtils.isLockPatternEnabled()) {
             return false;
         }
         final Intent intent = new Intent();
diff --git a/src/com/android/settings/ConfirmLockPassword.java b/src/com/android/settings/ConfirmLockPassword.java
index c74e861..b49dc6e 100644
--- a/src/com/android/settings/ConfirmLockPassword.java
+++ b/src/com/android/settings/ConfirmLockPassword.java
@@ -17,6 +17,7 @@
 package com.android.settings;
 
 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;
@@ -74,8 +75,8 @@
         setTitle(msg);
     }
 
-    public static class ConfirmLockPasswordFragment extends Fragment implements OnClickListener,
-            OnEditorActionListener, TextWatcher {
+    public static class ConfirmLockPasswordFragment extends InstrumentedFragment
+            implements OnClickListener, OnEditorActionListener, TextWatcher {
         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;
@@ -174,6 +175,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CONFIRM_LOCK_PASSWORD;
+        }
+
+        @Override
         public void onResume() {
             // TODO Auto-generated method stub
             super.onResume();
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index caf691d..b5d444b 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.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.LockPatternView;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
@@ -84,7 +85,7 @@
         return false;
     }
 
-    public static class ConfirmLockPatternFragment extends Fragment {
+    public static class ConfirmLockPatternFragment extends InstrumentedFragment {
 
         // how long we wait to clear a wrong pattern
         private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 2000;
@@ -148,7 +149,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 +173,11 @@
         }
 
         @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.CONFIRM_LOCK_PATTERN;
+        }
+
+        @Override
         public void onResume() {
             super.onResume();
 
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..45d3d11 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();
+            }
         }
     }
 
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..3fb60e3 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);
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index c4c79d1..6e72ef7 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;
 
@@ -831,7 +876,7 @@
 
         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()));
@@ -1837,8 +1882,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 +1932,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 +1947,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 +2581,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.
      */
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 a001fd7..e0091e1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -23,16 +23,19 @@
 import android.app.admin.DevicePolicyManager;
 import android.app.backup.IBackupManager;
 import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.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 +61,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,15 +139,21 @@
     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";
+    private static final String SELECT_LOGD_SIZE_PROPERTY = "persist.logd.size";
+    private static final String SELECT_LOGD_DEFAULT_SIZE_PROPERTY = "ro.logd.size";
+
+    private static final String DEBUG_NETWORKING_CATEGORY_KEY = "debug_networking_category";
     private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
     private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
     private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
     private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
-    private static final String SELECT_LOGD_SIZE_KEY = "select_logd_size";
-    private static final String SELECT_LOGD_SIZE_PROPERTY = "persist.logd.size";
-    private static final String SELECT_LOGD_DEFAULT_SIZE_PROPERTY = "ro.logd.size";
+    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";
 
@@ -153,8 +165,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";
@@ -167,6 +177,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;
@@ -197,6 +208,7 @@
     private SwitchPreference mWifiDisplayCertification;
     private SwitchPreference mWifiVerboseLogging;
     private SwitchPreference mWifiAggressiveHandover;
+    private SwitchPreference mLegacyDhcpClient;
 
     private SwitchPreference mWifiAllowScansWithTraffic;
     private SwitchPreference mStrictMode;
@@ -204,6 +216,7 @@
     private SwitchPreference mShowTouches;
     private SwitchPreference mShowScreenUpdates;
     private SwitchPreference mDisableOverlays;
+    private SwitchPreference mEnableMultiWindow;
     private SwitchPreference mShowCpuUsage;
     private SwitchPreference mForceHardwareUi;
     private SwitchPreference mForceMsaa;
@@ -213,6 +226,7 @@
     private SwitchPreference mForceRtlLayout;
     private ListPreference mDebugHwOverdraw;
     private ListPreference mLogdSize;
+    private ListPreference mUsbConfiguration;
     private ListPreference mTrackFrameTime;
     private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
@@ -247,6 +261,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVELOPMENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
@@ -269,7 +288,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)) {
@@ -336,12 +354,26 @@
         mWifiVerboseLogging = findAndInitSwitchPref(WIFI_VERBOSE_LOGGING_KEY);
         mWifiAggressiveHandover = findAndInitSwitchPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
         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);
@@ -419,6 +451,7 @@
     private void removePreference(Preference preference) {
         getPreferenceScreen().removePreference(preference);
         mAllPrefs.remove(preference);
+        mResetSwitchPrefs.remove(preference);
     }
 
     private void setPrefsEnabledState(boolean enabled) {
@@ -474,6 +507,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();
 
@@ -482,6 +524,7 @@
         }
         mSwitchBar.removeOnSwitchChangeListener(this);
         mSwitchBar.hide();
+        getActivity().unregisterReceiver(mUsbReceiver);
     }
 
     void updateSwitchPreference(SwitchPreference switchPreference, boolean value) {
@@ -531,6 +574,10 @@
         updateDebugLayoutOptions();
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
+        if (mEnableMultiWindow != null) {
+            updateSwitchPreference(mEnableMultiWindow,
+                    SystemProperties.getBoolean(MULTI_WINDOW_SYSTEM_PROPERTY, false));
+        }
         updateOpenGLTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
@@ -543,6 +590,7 @@
         updateWifiVerboseLoggingOptions();
         updateWifiAggressiveHandoverOptions();
         updateWifiAllowScansWithTrafficOptions();
+        updateLegacyDhcpClientOptions();
         updateSimulateColorSpace();
         updateUseNuplayerOptions();
         updateUSBAudioOptions();
@@ -693,6 +741,15 @@
         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() {
         if ("user".equals(Build.TYPE)) {
             final ContentResolver resolver = getActivity().getContentResolver();
@@ -743,7 +800,8 @@
     }
 
     private void updatePointerLocationOptions() {
-        updateSwitchPreference(mPointerLocation, Settings.System.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mPointerLocation,
+                Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.POINTER_LOCATION, 0) != 0);
     }
 
@@ -753,7 +811,8 @@
     }
 
     private void updateShowTouchesOptions() {
-        updateSwitchPreference(mShowTouches, Settings.System.getInt(getActivity().getContentResolver(),
+        updateSwitchPreference(mShowTouches,
+                Settings.System.getInt(getActivity().getContentResolver(),
                 Settings.System.SHOW_TOUCHES, 0) != 0);
     }
 
@@ -1022,7 +1081,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);
     }
 
@@ -1073,6 +1133,18 @@
         mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
     }
 
+    private void updateLegacyDhcpClientOptions() {
+        updateSwitchPreference(mLegacyDhcpClient, Settings.Global.getInt(
+                getActivity().getContentResolver(),
+                Settings.Global.LEGACY_DHCP_CLIENT, 0) != 0);
+    }
+
+    private void writeLegacyDhcpClientOptions() {
+        Settings.Global.putInt(getActivity().getContentResolver(),
+                Settings.Global.LEGACY_DHCP_CLIENT,
+                mLegacyDhcpClient.isChecked() ? 1 : 0);
+    }
+
     private void updateLogdSizeValues() {
         if (mLogdSize != null) {
             String currentValue = SystemProperties.get(SELECT_LOGD_SIZE_PROPERTY);
@@ -1122,8 +1194,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);
     }
 
@@ -1297,6 +1406,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()) {
@@ -1424,6 +1551,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) {
@@ -1450,6 +1583,8 @@
             writeWifiAggressiveHandoverOptions();
         } else if (preference == mWifiAllowScansWithTraffic) {
             writeWifiAllowScansWithTrafficOptions();
+        } else if (preference == mLegacyDhcpClient) {
+            writeLegacyDhcpClientOptions();
         } else if (preference == mUseAwesomePlayer) {
             writeUseAwesomePlayerOptions();
         } else if (preference == mUSBAudio) {
@@ -1478,6 +1613,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;
@@ -1592,6 +1730,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) {
@@ -1663,6 +1808,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 c9f876b..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;
 
@@ -386,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() {
@@ -409,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()));
@@ -438,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) {
@@ -480,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..061b133 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,11 @@
     Toast mDevHitToast;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO;
+    }
+
+    @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..47cbcde 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;
     }
 
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..96e612b
--- /dev/null
+++ b/src/com/android/settings/FingerprintEnroll.java
@@ -0,0 +1,450 @@
+/*
+ * 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.os.Vibrator;
+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 Vibrator mVibrator;
+        private ProgressBar mProgressBar;
+        private ImageView mFingerprintAnimator;
+        private ObjectAnimator mProgressAnim;
+
+        // 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;
+                    long challenge = 0x12345; // TODO: get from keyguard confirmation
+                    mFingerprintManager.enroll(challenge, mEnrollmentCallback, mEnrollmentCancel,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 (mVibrator != null) {
+                mVibrator.vibrate(100, new AudioAttributes.Builder()
+                        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                        .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION).build());
+            }
+            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) {
+                if (resultCode == RESULT_FINISHED) {
+                    // The lock pin/pattern/password was set. Start enrolling!
+                    updateStage(Stage.EnrollingFindSensor);
+                }
+            }
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            final Activity activity = getActivity();
+            mFingerprintManager = (FingerprintManager)activity
+                    .getSystemService(Context.FINGERPRINT_SERVICE);
+            mVibrator = (Vibrator) activity.getSystemService(Context.VIBRATOR_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);
+            }
+
+            LockPatternUtils utils = new LockPatternUtils(activity);
+            if (!utils.isSecure()) {
+                // Device doesn't have any security. Set that up first.
+                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());
+            if (mStage == Stage.EnrollingRepeat) {
+                outState.putInt(EXTRA_PROGRESS, mProgressBar.getProgress());
+            }
+        }
+
+        @Override
+        public void onActivityCreated(Bundle savedInstanceState) {
+            super.onActivityCreated(savedInstanceState);
+            if (savedInstanceState != null) {
+                //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) {
+                        launchChooseLock();
+                    } 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 launchChooseLock() {
+            Intent intent = new Intent();
+            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);
+            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..c134cfb
--- /dev/null
+++ b/src/com/android/settings/FingerprintSettings.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;
+
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+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 {
+
+    @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 int MSG_REFRESH_FINGERPRINT_TEMPLATES = 1000;
+        private static final int MSG_HIGHLIGHT_FINGERPRINT_ITEM = 1001;
+
+        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 AuthenticationCallback mAuthCallback = new AuthenticationCallback() {
+            int mAttempts;
+            @Override
+            public void onAuthenticationSucceeded(AuthenticationResult result) {
+                mHandler.obtainMessage(MSG_HIGHLIGHT_FINGERPRINT_ITEM,
+                        result.getFingerprint().getFingerId(), 0).sendToTarget();
+                retryFingerprint(true);
+            }
+
+            @Override
+            public void onAuthenticationError(int errMsgId, CharSequence errString) {
+                Toast.makeText(getActivity(), errString, Toast.LENGTH_SHORT);
+                retryFingerprint(false);
+            }
+
+            private void retryFingerprint(boolean resetAttempts) {
+                if (resetAttempts) {
+                    mAttempts = 0;
+                }
+                if (mAttempts < MAX_RETRY_ATTEMPTS) {
+                    mFingerprintManager.authenticate(null, mAuthCallback, null, 0);
+                }
+                mAttempts++;
+            }
+
+            @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;
+                }
+            };
+        };
+
+        @Override
+        protected int getMetricsCategory() {
+            return MetricsLogger.FINGERPRINT;
+        }
+
+        @Override
+        public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            mFingerprintManager = (FingerprintManager) getActivity().getSystemService(
+                    Context.FINGERPRINT_SERVICE);
+            mFingerprintManager.authenticate(null, mAuthCallback, null, 0);
+        }
+
+        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();
+        }
+
+        @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());
+                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;
+        }
+    }
+
+    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/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..0e47afb 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;
@@ -242,6 +240,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.ICC_LOCK;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/InstrumentedFragment.java b/src/com/android/settings/InstrumentedFragment.java
new file mode 100644
index 0000000..604af18
--- /dev/null
+++ b/src/com/android/settings/InstrumentedFragment.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;
+
+import android.preference.PreferenceFragment;
+import com.android.internal.logging.MetricsLogger;
+
+/**
+ * Instrumented fragment that logs visibility state.
+ */
+public abstract class InstrumentedFragment extends PreferenceFragment {
+    // Declare new temproary categories here, starting after this value.
+    public static final int VIEW_CATEGORY_UNDECLARED = 100000;
+
+    /**
+     * 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/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..1b6468f 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,
+                null, res.getText(R.string.master_clear_gesture_explanation));
     }
 
     @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/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index 0761f38..54b7cab 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -17,11 +17,9 @@
 package com.android.settings;
 
 import android.app.Fragment;
-import android.content.ContentResolver;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.provider.Settings;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -31,9 +29,10 @@
 import android.widget.EditText;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.widget.LockPatternUtils;
 
-public class OwnerInfoSettings extends Fragment {
+public class OwnerInfoSettings extends InstrumentedFragment {
 
     public static final String EXTRA_SHOW_NICKNAME = "show_nickname";
 
@@ -101,6 +100,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.OWNER_INFO;
+    }
+
+    @Override
     public void onPause() {
         super.onPause();
         saveChanges();
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 8df78c5..4eb8a9e 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();
     }
 
@@ -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/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
new file mode 100644
index 0000000..a3376d3
--- /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,
+                null, res.getText(R.string.reset_network_gesture_explanation));
+    }
+
+    @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..1edc7a9
--- /dev/null
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -0,0 +1,130 @@
+/*
+ * 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
+
+            ConnectivityManager connectivityManager = (ConnectivityManager)
+                    getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
+            if (connectivityManager != null) {
+                connectivityManager.factoryReset();
+            }
+
+            WifiManager wifiManager = (WifiManager)
+                    getActivity().getSystemService(Context.WIFI_SERVICE);
+            if (wifiManager != null) {
+                wifiManager.factoryReset();
+            }
+
+            TelephonyManager telephonyManager = (TelephonyManager)
+                    getActivity().getSystemService(Context.TELEPHONY_SERVICE);
+            if (telephonyManager != null) {
+                telephonyManager.factoryReset(mSubId);
+            }
+
+            NetworkPolicyManager policyManager = (NetworkPolicyManager)
+                    getActivity().getSystemService(Context.NETWORK_POLICY_SERVICE);
+            if (policyManager != null) {
+                String subscriberId = telephonyManager.getSubscriberId(mSubId);
+                policyManager.factoryReset(subscriberId);
+            }
+
+            Toast.makeText(getActivity(), 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..3ac2ac6 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -39,8 +39,9 @@
 import android.preference.PreferenceScreen;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
 import android.security.KeyStore;
+import android.hardware.fingerprint.Fingerprint;
+import android.hardware.fingerprint.FingerprintManager;
 import android.service.trust.TrustAgentService;
 import android.telephony.TelephonyManager;
 import android.telephony.SubscriptionManager;
@@ -48,6 +49,7 @@
 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;
@@ -65,17 +67,14 @@
  */
 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;
@@ -134,6 +131,11 @@
     private Intent mTrustAgentClickIntent;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SECURITY;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -165,9 +167,6 @@
             } 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:
@@ -230,32 +229,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 +244,6 @@
             updateLockAfterPreferenceSummary();
         }
 
-        // biometric weak liveliness
-        mBiometricWeakLiveliness =
-                (SwitchPreference) root.findPreference(KEY_BIOMETRIC_WEAK_LIVELINESS);
-
         // visible pattern
         mVisiblePattern = (SwitchPreference) root.findPreference(KEY_VISIBLE_PATTERN);
 
@@ -284,15 +259,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 +336,59 @@
         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);
+        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);
+            }
+        }
+    }
+
     /* Return true if a there is a Slot that has Icc.
      */
     private boolean isSimIccReady() {
@@ -562,10 +581,6 @@
         createPreferenceHierarchy();
 
         final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
-        if (mBiometricWeakLiveliness != null) {
-            mBiometricWeakLiveliness.setChecked(
-                    lockPatternUtils.isBiometricWeakLivelinessEnabled());
-        }
         if (mVisiblePattern != null) {
             mVisiblePattern.setChecked(lockPatternUtils.isVisiblePatternEnabled());
         }
@@ -589,17 +604,6 @@
         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);
@@ -623,19 +627,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 +651,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 +676,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()"
      */
@@ -832,13 +796,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 84bf6157..20ce116 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -47,6 +47,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) {
@@ -97,9 +98,9 @@
     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 TopLevelSettings extends SettingsActivity { /* empty */ }
     public static class ApnSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class WifiCallingSettingsActivity extends SettingsActivity { /* empty */ }
 }
 
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index dc5675c..4794608 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;
@@ -81,11 +86,6 @@
 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;
@@ -98,9 +98,12 @@
 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.ZenModeSettings;
 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;
@@ -119,10 +122,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,
@@ -204,6 +206,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;
@@ -298,11 +329,10 @@
             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()
+            ApnSettings.class.getName(),
+            WifiCallingSettings.class.getName()
     };
 
 
@@ -534,7 +564,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) {
@@ -753,6 +788,9 @@
     @Override
     public void onResume() {
         super.onResume();
+        if (mIsShowingDashboard) {
+            MetricsLogger.visible(this, MetricsLogger.MAIN_SETTINGS);
+        }
 
         final int newHomeActivityCount = getHomeActivitiesCount();
         if (newHomeActivityCount != mHomeActivitiesCount) {
@@ -781,7 +819,9 @@
     @Override
     public void onPause() {
         super.onPause();
-
+        if (mIsShowingDashboard) {
+            MetricsLogger.hidden(this, MetricsLogger.MAIN_SETTINGS);
+        }
         unregisterReceiver(mBatteryInfoReceiver);
         mDynamicIndexableContentMonitor.unregister();
     }
@@ -1034,6 +1074,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
@@ -1109,6 +1160,8 @@
                                 category.addTile(tile);
                             }
 
+                        } else if (innerNodeName.equals("external-tiles")) {
+                            category.externalIndex = category.getTilesCount();
                         } else {
                             XmlUtils.skipCurrentTag(parser);
                         }
@@ -1230,6 +1283,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..bf41c80 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;
@@ -46,7 +45,8 @@
 /**
  * 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";
 
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java
index 42e2baa..10bac15 100644
--- a/src/com/android/settings/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/SetupChooseLockGeneric.java
@@ -24,7 +24,6 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
-import android.util.MutableBoolean;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -94,16 +93,23 @@
             SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle());
         }
 
+        @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.
+        }
+
         /***
          * Disables preferences that are less secure than required quality and shows only secure
          * 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,24 +117,23 @@
             // 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,
+        protected Intent getLockPasswordIntent(Context context, int quality,
                 int minLength, int maxLength, boolean requirePasswordToDecrypt,
                 boolean confirmCredentials) {
             final Intent intent = SetupChooseLockPassword.createIntent(context, quality,
-                    isFallback, minLength, maxLength, requirePasswordToDecrypt, confirmCredentials);
+                    minLength, maxLength, requirePasswordToDecrypt, confirmCredentials);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
         }
 
         @Override
-        protected Intent getLockPatternIntent(Context context, boolean isFallback,
+        protected Intent getLockPatternIntent(Context context,
                 boolean requirePassword, boolean confirmCredentials) {
-            final Intent intent = SetupChooseLockPattern.createIntent(context, isFallback,
+            final Intent intent = SetupChooseLockPattern.createIntent(context,
                     requirePassword, confirmCredentials);
             SetupWizardUtils.copySetupExtras(getActivity().getIntent(), intent);
             return intent;
diff --git a/src/com/android/settings/SetupChooseLockPassword.java b/src/com/android/settings/SetupChooseLockPassword.java
index 4274205..b9f408e 100644
--- a/src/com/android/settings/SetupChooseLockPassword.java
+++ b/src/com/android/settings/SetupChooseLockPassword.java
@@ -38,10 +38,10 @@
 public class SetupChooseLockPassword extends ChooseLockPassword
         implements SetupWizardNavBar.NavigationBarListener {
 
-    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);
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index 7f2480b..903a207 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -38,9 +38,9 @@
 public class SetupChooseLockPattern extends ChooseLockPattern
         implements SetupWizardNavBar.NavigationBarListener {
 
-    public static Intent createIntent(Context context, final boolean isFallback,
+    public static Intent createIntent(Context context,
             boolean requirePassword, boolean confirmCredentials) {
-        Intent intent = ChooseLockPattern.createIntent(context, isFallback, requirePassword,
+        Intent intent = ChooseLockPattern.createIntent(context, requirePassword,
                 confirmCredentials);
         intent.setClass(context, SetupChooseLockPattern.class);
         return intent;
diff --git a/src/com/android/settings/SetupRedactionInterstitial.java b/src/com/android/settings/SetupRedactionInterstitial.java
index 453e729..badfe8d 100644
--- a/src/com/android/settings/SetupRedactionInterstitial.java
+++ b/src/com/android/settings/SetupRedactionInterstitial.java
@@ -67,6 +67,7 @@
     @Override
     public void onNavigationBarCreated(SetupWizardNavBar bar) {
         SetupWizardUtils.setImmersiveMode(this, bar);
+        bar.getBackButton().setEnabled(false);
     }
 
     @Override
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index 3d44125..c35bb15 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -26,7 +26,6 @@
 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;
 
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..1427d5f 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/TrustAgentSettings.java
@@ -32,6 +32,7 @@
 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
@@ -61,6 +62,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.TRUST_AGENT;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         addPreferencesFromResource(R.xml.trust_agent_settings);
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
index 89e184e..704c3c5 100644
--- a/src/com/android/settings/UsageAccessSettings.java
+++ b/src/com/android/settings/UsageAccessSettings.java
@@ -17,7 +17,6 @@
 package com.android.settings;
 
 import com.android.internal.content.PackageMonitor;
-
 import android.Manifest;
 import android.app.ActivityThread;
 import android.app.AlertDialog;
@@ -28,6 +27,7 @@
 import android.app.FragmentTransaction;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -35,18 +35,24 @@
 import android.os.Bundle;
 import android.os.Looper;
 import android.os.RemoteException;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.util.ArrayMap;
 import android.util.Log;
+import android.util.SparseArray;
+import com.android.internal.logging.MetricsLogger;
 
 import java.util.List;
+import java.util.Collections;
 
 public class UsageAccessSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener {
 
     private static final String TAG = "UsageAccessSettings";
+    private static final String BUNDLE_KEY_PROFILEID = "profileId";
 
     private static final String[] PM_USAGE_STATS_PERMISSION = new String[] {
             Manifest.permission.PACKAGE_USAGE_STATS
@@ -56,16 +62,23 @@
             AppOpsManager.OP_GET_USAGE_STATS
     };
 
-    private static class PackageEntry {
-        public PackageEntry(String packageName) {
+    private static class PackageEntry implements Comparable<PackageEntry> {
+        public PackageEntry(String packageName, UserHandle userHandle) {
             this.packageName = packageName;
             this.appOpMode = AppOpsManager.MODE_DEFAULT;
+            this.userHandle = userHandle;
+        }
+
+        @Override
+        public int compareTo(PackageEntry another) {
+            return packageName.compareTo(another.packageName);
         }
 
         final String packageName;
         PackageInfo packageInfo;
         boolean permissionGranted;
         int appOpMode;
+        UserHandle userHandle;
 
         SwitchPreference preference;
     }
@@ -75,69 +88,102 @@
      * the PreferenceScreen with the results when complete.
      */
     private class AppsRequestingAccessFetcher extends
-            AsyncTask<Void, Void, ArrayMap<String, PackageEntry>> {
+            AsyncTask<Void, Void, SparseArray<ArrayMap<String, PackageEntry>>> {
 
         private final Context mContext;
         private final PackageManager mPackageManager;
         private final IPackageManager mIPackageManager;
+        private final UserManager mUserManager;
+        private final List<UserHandle> mProfiles;
 
         public AppsRequestingAccessFetcher(Context context) {
             mContext = context;
             mPackageManager = context.getPackageManager();
             mIPackageManager = ActivityThread.getPackageManager();
+            mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            mProfiles = mUserManager.getUserProfiles();
         }
 
         @Override
-        protected ArrayMap<String, PackageEntry> doInBackground(Void... params) {
+        protected SparseArray<ArrayMap<String, PackageEntry>> doInBackground(Void... params) {
             final String[] packages;
+            SparseArray<ArrayMap<String, PackageEntry>> entries;
             try {
                 packages = mIPackageManager.getAppOpPermissionPackages(
                         Manifest.permission.PACKAGE_USAGE_STATS);
+
+                if (packages == null) {
+                    // No packages are requesting permission to use the UsageStats API.
+                    return null;
+                }
+
+                entries = new SparseArray<>();
+                for (final UserHandle profile : mProfiles) {
+                    final ArrayMap<String, PackageEntry> 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 PackageEntry newEntry = new PackageEntry(packageName, profile);
+                            entriesForProfile.put(packageName, newEntry);
+                        }
+                    }
+                }
             } 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;
+            try {
+                for (final UserHandle profile : mProfiles) {
+                    final int profileId = profile.getIdentifier();
+                    final ArrayMap<String, PackageEntry> entriesForProfile = entries.get(profileId);
+                    if (entriesForProfile == null) {
+                        continue;
+                    }
+                    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 PackageEntry 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);
+                return null;
             }
 
             // 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--;
+            for (final UserHandle profile : mProfiles) {
+                final int profileId = profile.getIdentifier();
+                final ArrayMap<String, PackageEntry> entriesForProfile = entries.get(profileId);
+                if (entriesForProfile == null) {
+                    continue;
+                }
+                int packageCount = entriesForProfile.size();
+                for (int i = packageCount - 1; i >= 0; --i) {
+                    final PackageEntry pe = entriesForProfile.valueAt(i);
+                    if (pe.packageInfo == null) {
+                        try {
+                            pe.packageInfo = mIPackageManager.getPackageInfo(pe.packageName, 0,
+                                    profileId);
+                        } catch (RemoteException 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.
+                            entriesForProfile.removeAt(i);
+                        }
                     }
                 }
             }
@@ -148,15 +194,21 @@
             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");
+                final int userId = UserHandle.getUserId(packageOp.getUid());
+                if (!isThisUserAProfileOfCurrentUser(userId)) {
+                    // This AppOp does not belong to any of this user's profiles.
                     continue;
                 }
 
-                if (packageOp.getUid() != pe.packageInfo.applicationInfo.uid) {
-                    // This AppOp does not belong to this user.
+                final ArrayMap<String, PackageEntry> entriesForProfile = entries.get(userId);
+                if (entriesForProfile == null) {
+                    continue;
+                }
+                final PackageEntry 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;
                 }
 
@@ -173,7 +225,7 @@
         }
 
         @Override
-        protected void onPostExecute(ArrayMap<String, PackageEntry> newEntries) {
+        protected void onPostExecute(SparseArray<ArrayMap<String, PackageEntry>> newEntries) {
             mLastFetcherTask = null;
 
             if (getActivity() == null) {
@@ -188,41 +240,126 @@
             }
 
             // 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;
+            final int oldProfileCount = mPackageEntryMap.size();
+            for (int profileIndex = 0; profileIndex < oldProfileCount; ++profileIndex) {
+                final int profileId = mPackageEntryMap.keyAt(profileIndex);
+                final ArrayMap<String, PackageEntry> oldEntriesForProfile = mPackageEntryMap
+                        .valueAt(profileIndex);
+                final int oldPackageCount = oldEntriesForProfile.size();
+
+                final ArrayMap<String, PackageEntry> newEntriesForProfile = newEntries.get(
+                        profileId);
+
+                for (int i = 0; i < oldPackageCount; i++) {
+                    final PackageEntry oldPackageEntry = oldEntriesForProfile.valueAt(i);
+
+                    PackageEntry newPackageEntry = null;
+                    if (newEntriesForProfile != null) {
+                        newPackageEntry = newEntriesForProfile.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);
+            final int newProfileCount = newEntries.size();
+            for (int profileIndex = 0; profileIndex < newProfileCount; ++profileIndex) {
+                final int profileId = newEntries.keyAt(profileIndex);
+                final ArrayMap<String, PackageEntry> newEntriesForProfile = newEntries.get(
+                        profileId);
+                final int packageCount = newEntriesForProfile.size();
+                for (int i = 0; i < packageCount; i++) {
+                    final PackageEntry packageEntry = newEntriesForProfile.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);
                 }
-                updatePreference(packageEntry);
             }
-
             mPackageEntryMap.clear();
             mPackageEntryMap = newEntries;
+
+            // Add/remove headers if necessary. If there are package entries only for one user and
+            // that user is not the managed profile then do not show headers.
+            if (mPackageEntryMap.size() == 1 &&
+                    mPackageEntryMap.keyAt(0) == UserHandle.myUserId()) {
+                for (int i = 0; i < mCategoryHeaders.length; ++i) {
+                    if (mCategoryHeaders[i] != null) {
+                        mPreferenceScreen.removePreference(mCategoryHeaders[i]);
+                    }
+                    mCategoryHeaders[i] = null;
+                }
+            } else {
+                for (int i = 0; i < mCategoryHeaders.length; ++i) {
+                    if (mCategoryHeaders[i] == null) {
+                        final Preference preference = new Preference(mContext, null,
+                                com.android.internal.R.attr.preferenceCategoryStyle, 0);
+                        mCategoryHeaders[i] = preference;
+                        preference.setTitle(mCategoryHeaderTitleResIds[i]);
+                        preference.setEnabled(false);
+                        mPreferenceScreen.addPreference(preference);
+                    }
+                }
+            }
+
+            // Sort preferences alphabetically within categories
+            int order = 0;
+            final int profileCount = mProfiles.size();
+            for (int i = 0; i < profileCount; ++i) {
+                Preference header = mCategoryHeaders[i];
+                if (header != null) {
+                    header.setOrder(order++);
+                }
+                ArrayMap<String, PackageEntry> entriesForProfile =
+                        mPackageEntryMap.get(mProfiles.get(i).getIdentifier());
+                if (entriesForProfile != null) {
+                    List<PackageEntry> sortedEntries = Collections.list(
+                            Collections.enumeration(entriesForProfile.values()));
+                    Collections.sort(sortedEntries);
+                    for (PackageEntry pe : sortedEntries) {
+                        pe.preference.setOrder(order++);
+                    }
+                }
+            }
         }
 
         private void updatePreference(PackageEntry pe) {
-            pe.preference.setIcon(pe.packageInfo.applicationInfo.loadIcon(mPackageManager));
-            pe.preference.setTitle(pe.packageInfo.applicationInfo.loadLabel(mPackageManager));
+            final int profileId = pe.userHandle.getIdentifier();
+            // Set something as default
+            pe.preference.setEnabled(false);
+            pe.preference.setTitle(pe.packageName);
+            pe.preference.setIcon(mUserManager.getBadgedIconForUser(mPackageManager
+                    .getDefaultActivityIcon(), pe.userHandle));
+            try {
+                // Try setting real title and icon
+                final ApplicationInfo info = mIPackageManager.getApplicationInfo(pe.packageName,
+                        0 /* no flags */, profileId);
+                if (info != null) {
+                    pe.preference.setEnabled(true);
+                    pe.preference.setTitle(info.loadLabel(mPackageManager).toString());
+                    pe.preference.setIcon(mUserManager.getBadgedIconForUser(info.loadIcon(
+                            mPackageManager), pe.userHandle));
+                }
+            } catch (RemoteException e) {
+                Log.w(TAG, "PackageManager is dead. Can't get app info for package " +
+                        pe.packageName + " of user " + profileId);
+                // Keep going to update other parts of the preference
+            }
+
             pe.preference.setKey(pe.packageName);
+            Bundle extra = pe.preference.getExtras();
+            extra.putInt(BUNDLE_KEY_PROFILEID, profileId);
 
             boolean check = false;
             if (pe.appOpMode == AppOpsManager.MODE_ALLOWED) {
@@ -237,6 +374,16 @@
                 pe.preference.setChecked(check);
             }
         }
+
+        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;
+        }
     }
 
     static boolean shouldIgnorePackage(String packageName) {
@@ -244,9 +391,19 @@
     }
 
     private AppsRequestingAccessFetcher mLastFetcherTask;
-    ArrayMap<String, PackageEntry> mPackageEntryMap = new ArrayMap<>();
+    SparseArray<ArrayMap<String, PackageEntry>> mPackageEntryMap = new SparseArray<>();
     AppOpsManager mAppOpsManager;
     PreferenceScreen mPreferenceScreen;
+    private Preference[] mCategoryHeaders = new Preference[2];
+    private static int[] mCategoryHeaderTitleResIds = new int[] {
+        R.string.category_personal,
+        R.string.category_work
+    };
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.USAGE_ACCESS;
+    }
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -293,16 +450,16 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         final String packageName = preference.getKey();
-        final PackageEntry pe = mPackageEntryMap.get(packageName);
+        final int profileId = preference.getExtras().getInt(BUNDLE_KEY_PROFILEID);
+        final PackageEntry pe = getPackageEntry(packageName, profileId);
         if (pe == null) {
-            Log.w(TAG, "Preference change event for package " + packageName
-                    + " but that package is no longer valid.");
+            Log.w(TAG, "Preference change event handling failed");
             return false;
         }
 
         if (!(newValue instanceof Boolean)) {
-            Log.w(TAG, "Preference change event for package " + packageName
-                    + " had non boolean value of type " + newValue.getClass().getName());
+            Log.w(TAG, "Preference change event for package " + packageName + " of user " +
+                    profileId + " had non boolean value of type " + newValue.getClass().getName());
             return false;
         }
 
@@ -323,7 +480,7 @@
             if (prev != null) {
                 ft.remove(prev);
             }
-            WarningDialogFragment.newInstance(pe.packageName).show(ft, "warning");
+            WarningDialogFragment.newInstance(pe).show(ft, "warning");
             return false;
         }
         return true;
@@ -335,10 +492,10 @@
         pe.appOpMode = newMode;
     }
 
-    void allowAccess(String packageName) {
-        final PackageEntry entry = mPackageEntryMap.get(packageName);
+    void allowAccess(String packageName, int profileId) {
+        final PackageEntry entry = getPackageEntry(packageName, profileId);
         if (entry == null) {
-            Log.w(TAG, "Unable to give access to package " + packageName + ": it does not exist.");
+            Log.w(TAG, "Unable to give access");
             return;
         }
 
@@ -346,6 +503,21 @@
         entry.preference.setChecked(true);
     }
 
+    private PackageEntry getPackageEntry(String packageName, int profileId) {
+        ArrayMap<String, PackageEntry> entriesForProfile = mPackageEntryMap.get(profileId);
+        if (entriesForProfile == null) {
+            Log.w(TAG, "getPackageEntry fails for package " + packageName + " of user " +
+                    profileId + ": user does not seem to be valid.");
+            return null;
+        }
+        final PackageEntry entry = entriesForProfile.get(packageName);
+        if (entry == null) {
+            Log.w(TAG, "getPackageEntry fails for package " + packageName + " of user " +
+                    profileId + ": package does not exist.");
+        }
+        return entry;
+    }
+
     private final PackageMonitor mPackageMonitor = new PackageMonitor() {
         @Override
         public void onPackageAdded(String packageName, int uid) {
@@ -361,11 +533,13 @@
     public static class WarningDialogFragment extends DialogFragment
             implements DialogInterface.OnClickListener {
         private static final String ARG_PACKAGE_NAME = "package";
+        private static final String ARG_PROFILE_ID = "profileId";
 
-        public static WarningDialogFragment newInstance(String packageName) {
+        public static WarningDialogFragment newInstance(PackageEntry pe) {
             WarningDialogFragment dialog = new WarningDialogFragment();
             Bundle args = new Bundle();
-            args.putString(ARG_PACKAGE_NAME, packageName);
+            args.putString(ARG_PACKAGE_NAME, pe.packageName);
+            args.putInt(ARG_PROFILE_ID, pe.userHandle.getIdentifier());
             dialog.setArguments(args);
             return dialog;
         }
@@ -385,7 +559,8 @@
         public void onClick(DialogInterface dialog, int which) {
             if (which == DialogInterface.BUTTON_POSITIVE) {
                 ((UsageAccessSettings) getParentFragment()).allowAccess(
-                        getArguments().getString(ARG_PACKAGE_NAME));
+                        getArguments().getString(ARG_PACKAGE_NAME),
+                        getArguments().getInt(ARG_PROFILE_ID));
             } 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..bc6cbed 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -37,6 +37,7 @@
 import android.content.pm.Signature;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
+import android.content.res.TypedArray;
 import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -51,6 +52,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 +67,15 @@
 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.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.dashboard.DashboardTile;
 import com.android.settings.drawable.CircleFramedDrawable;
 
@@ -110,19 +114,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 +134,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 +198,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 +218,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 +238,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 +738,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 +757,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 +867,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 +903,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)));
     }
 
     /**
@@ -1095,4 +1080,43 @@
         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;
+    }
 }
diff --git a/src/com/android/settings/WallpaperTypeSettings.java b/src/com/android/settings/WallpaperTypeSettings.java
index 7b2dcbf..8c8da31 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,11 @@
 public class WallpaperTypeSettings extends SettingsPreferenceFragment implements Indexable {
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WALLPAPER_TYPE;
+    }
+
+    @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
new file mode 100644
index 0000000..c950949
--- /dev/null
+++ b/src/com/android/settings/WifiCallingSettings.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;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceScreen;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.widget.Switch;
+import android.widget.TextView;
+
+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;
+
+/**
+ * "Wi-Fi Calling settings" screen.  This preference screen lets you
+ * enable/disable Wi-Fi Calling and change Wi-Fi Calling mode.
+ */
+public class WifiCallingSettings extends SettingsPreferenceFragment
+        implements SwitchBar.OnSwitchChangeListener,
+        Preference.OnPreferenceChangeListener {
+
+    private static final String TAG = "WifiCallingSettings";
+
+    //String keys for preference lookup
+    private static final String BUTTON_WFC_MODE = "wifi_calling_mode";
+
+    //UI objects
+    private SwitchBar mSwitchBar;
+    private Switch mSwitch;
+    private ListPreference mButtonWfcMode;
+    private TextView mEmptyView;
+
+    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+        /*
+         * Enable/disable controls when in/out of a call and depending on
+         * TTY mode and TTY support over VoLTE.
+         * @see android.telephony.PhoneStateListener#onCallStateChanged(int,
+         * java.lang.String)
+         */
+        @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            final SettingsActivity activity = (SettingsActivity) getActivity();
+            boolean isNonTtyOrTtyOnVolteEnabled = ImsManager
+                    .isNonTtyOrTtyOnVolteEnabled(activity);
+            final SwitchBar switchBar = activity.getSwitchBar();
+            boolean isWfcEnabled = switchBar.getSwitch().isChecked()
+                    && isNonTtyOrTtyOnVolteEnabled;
+
+            switchBar.setEnabled((state == TelephonyManager.CALL_STATE_IDLE)
+                    && isNonTtyOrTtyOnVolteEnabled);
+
+            Preference pref = getPreferenceScreen().findPreference(BUTTON_WFC_MODE);
+            if (pref != null) {
+                pref.setEnabled(isWfcEnabled
+                        && (state == TelephonyManager.CALL_STATE_IDLE));
+            }
+        }
+    };
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        final SettingsActivity activity = (SettingsActivity) getActivity();
+
+        mSwitchBar = activity.getSwitchBar();
+        mSwitch = mSwitchBar.getSwitch();
+        mSwitchBar.show();
+
+        mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
+        getListView().setEmptyView(mEmptyView);
+        mEmptyView.setText(R.string.wifi_calling_off_explanation);
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        mSwitchBar.hide();
+    }
+
+    private void showAlert(Intent intent) {
+        Context context = getActivity();
+
+        CharSequence title = intent.getCharSequenceExtra(ImsPhone.EXTRA_KEY_ALERT_TITLE);
+        CharSequence message = intent.getCharSequenceExtra(ImsPhone.EXTRA_KEY_ALERT_MESSAGE);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(context);
+        builder.setMessage(message)
+                .setTitle(title)
+                .setIcon(android.R.drawable.ic_dialog_alert)
+                .setPositiveButton(android.R.string.ok, null);
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+    private IntentFilter mIntentFilter;
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(ImsManager.ACTION_IMS_REGISTRATION_ERROR)) {
+                // If this fragment is active then we are immediately
+                // showing alert on screen. There is no need to add
+                // notification in this case.
+                //
+                // In order to communicate to ImsPhone that it should
+                // not show notification, we are changing result code here.
+                setResultCode(Activity.RESULT_CANCELED);
+
+                // UX requirement is to disable WFC in case of "permanent" registration failures.
+                mSwitch.setChecked(false);
+
+                showAlert(intent);
+            }
+        }
+    };
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI_CALLING;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.wifi_calling_settings);
+
+        mButtonWfcMode = (ListPreference) findPreference(BUTTON_WFC_MODE);
+        mButtonWfcMode.setOnPreferenceChangeListener(this);
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(ImsManager.ACTION_IMS_REGISTRATION_ERROR);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        final Context context = getActivity();
+
+        if (ImsManager.isWfcEnabledByPlatform(context)) {
+            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_CALL_STATE);
+
+            mSwitchBar.addOnSwitchChangeListener(this);
+        }
+
+        // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
+        boolean wfcEnabled = ImsManager.isWfcEnabledByUser(context)
+                && ImsManager.isNonTtyOrTtyOnVolteEnabled(context);
+        mSwitch.setChecked(wfcEnabled);
+
+        int wfcMode = ImsManager.getWfcMode(context);
+        mButtonWfcMode.setValue(Integer.toString(wfcMode));
+        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
+
+        context.registerReceiver(mIntentReceiver, mIntentFilter);
+
+        Intent intent = getActivity().getIntent();
+        if (intent.getBooleanExtra(ImsPhone.EXTRA_KEY_ALERT_SHOW, false)) {
+            showAlert(intent);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        final Context context = getActivity();
+
+        if (ImsManager.isWfcEnabledByPlatform(getActivity())) {
+            TelephonyManager tm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
+            tm.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+
+            mSwitchBar.removeOnSwitchChangeListener(this);
+        }
+
+        context.unregisterReceiver(mIntentReceiver);
+    }
+
+    /**
+     * Listens to the state change of the switch.
+     */
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        final Context context = getActivity();
+
+        ImsManager.setWfcSetting(context, isChecked);
+
+        int wfcMode = ImsManager.getWfcMode(context);
+        mButtonWfcMode.setSummary(getWfcModeSummary(context, wfcMode));
+        mButtonWfcMode.setEnabled(isChecked);
+
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        if (isChecked) {
+            preferenceScreen.addPreference(mButtonWfcMode);
+        } else {
+            preferenceScreen.removePreference(mButtonWfcMode);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        final Context context = getActivity();
+        if (preference == mButtonWfcMode) {
+            mButtonWfcMode.setValue((String) newValue);
+            int buttonMode = Integer.valueOf((String) newValue);
+            int currentMode = ImsManager.getWfcMode(context);
+            if (buttonMode != currentMode) {
+                ImsManager.setWfcMode(context, buttonMode);
+                mButtonWfcMode.setSummary(getWfcModeSummary(context, buttonMode));
+            }
+        }
+        return true;
+    }
+
+    static int getWfcModeSummary(Context context, int wfcMode) {
+        int resId = com.android.internal.R.string.wifi_calling_off_summary;
+        if (ImsManager.isWfcEnabledByUser(context)) {
+            switch (wfcMode) {
+                case ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY:
+                    resId = com.android.internal.R.string.wfc_mode_wifi_only_summary;
+                    break;
+                case ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED:
+                    resId = com.android.internal.R.string.wfc_mode_cellular_preferred_summary;
+                    break;
+                case ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED:
+                    resId = com.android.internal.R.string.wfc_mode_wifi_preferred_summary;
+                    break;
+                default:
+                    Log.e(TAG, "Unexpected WFC mode value: " + wfcMode);
+            }
+        }
+        return resId;
+    }
+}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index e9c39d9..000aa30 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -47,6 +47,8 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import com.android.ims.ImsManager;
+import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.SmsApplication;
 import com.android.internal.telephony.SmsApplication.SmsApplicationData;
 import com.android.internal.telephony.TelephonyIntents;
@@ -54,7 +56,6 @@
 import com.android.settings.nfc.NfcEnabler;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -76,6 +77,7 @@
     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";
 
     public static final String EXIT_ECM_RESULT = "exit_ecm_result";
     public static final int REQUEST_CODE_EXIT_ECM = 1;
@@ -95,6 +97,7 @@
     private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
 
     private AppListPreference mSmsApplicationPreference;
+    private PreferenceScreen mButtonWfc;
 
     /**
      * Invoked on each preference click in this hierarchy, overrides
@@ -230,22 +233,17 @@
         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
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null) {
@@ -282,6 +280,12 @@
             initSmsApplicationSetting();
         }
 
+        if (ImsManager.isWfcEnabledByPlatform(activity)) {
+            mButtonWfc = (PreferenceScreen) findPreference(KEY_WFC_SETTINGS);
+        } else {
+            removePreference(KEY_WFC_SETTINGS);
+        }
+
         // Remove NSD checkbox by default
         getPreferenceScreen().removePreference(nsd);
         //mNsdEnabler = new NsdEnabler(activity, nsd);
@@ -423,6 +427,12 @@
         if (mNsdEnabler != null) {
             mNsdEnabler.resume();
         }
+
+        final Context context = getActivity();
+        if (ImsManager.isWfcEnabledByPlatform(context)) {
+            mButtonWfc.setSummary(WifiCallingSettings.getWfcModeSummary(
+                    context, ImsManager.getWfcMode(context)));
+        }
     }
 
     @Override
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..c4b3a96 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,11 @@
     private DevicePolicyManager mDpm;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.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..d5ab8dc
--- /dev/null
+++ b/src/com/android/settings/applications/AdvancedAppSettings.java
@@ -0,0 +1,284 @@
+/*
+ * 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.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.util.Log;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+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.Callbacks;
+import com.android.settings.applications.ApplicationsState.Session;
+import com.android.settings.applications.PermissionsInfo.Callback;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AdvancedAppSettings extends SettingsPreferenceFragment implements Callbacks,
+        DialogInterface.OnClickListener, DialogInterface.OnDismissListener, 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_ALL_APPS = "all_apps";
+    private static final String KEY_RESET_ALL = "reset_all";
+    private static final String EXTRA_RESET_DIALOG = "resetDialog";
+
+    private ApplicationsState mApplicationsState;
+    private Session mSession;
+    private Preference mAppPerms;
+    private Preference mAllApps;
+    private Preference mResetAll;
+
+    AlertDialog mResetDialog;
+
+    private boolean mActivityResumed;
+    private PackageManager mPm;
+    private IPackageManager mIPm;
+    private INotificationManager mNm;
+    private NetworkPolicyManager mNpm;
+    private AppOpsManager mAom;
+    private Handler mHandler;
+    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);
+
+        mAppPerms = findPreference(KEY_APP_PERM);
+        mAllApps = findPreference(KEY_ALL_APPS);
+        mResetAll = findPreference(KEY_RESET_ALL);
+        mResetAll.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                buildResetDialog();
+                return true;
+            }
+        });
+        updateAllAppsSummary();
+
+        mPm = getActivity().getPackageManager();
+        mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
+        mNm = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        mNpm = NetworkPolicyManager.from(getActivity());
+        mAom = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);
+        mHandler = new Handler(getActivity().getMainLooper());
+    }
+
+    private void updateAllAppsSummary() {
+        mAllApps.setSummary(getString(R.string.all_apps_summary, mSession.getAllApps().size()));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        if (savedInstanceState != null && savedInstanceState.getBoolean(EXTRA_RESET_DIALOG)) {
+            buildResetDialog();
+        }
+
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onStop() {
+        super.onStop();
+        if (mResetDialog != null) {
+            mResetDialog.dismiss();
+            mResetDialog = null;
+        }
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.APPLICATIONS_ADVANCED;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mActivityResumed = true;
+        mPermissionsInfo = new PermissionsInfo(getActivity(), this);
+    }
+
+    @Override
+    public void onPause() {
+        mActivityResumed = false;
+        super.onPause();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        if (mResetDialog != null) {
+            outState.putBoolean(EXTRA_RESET_DIALOG, 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) {
+            (new AsyncTask<Void, Void, Void>() {
+                @Override protected Void doInBackground(Void... params) {
+                    List<ApplicationInfo> apps = mPm.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);
+                            mNm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
+                        } catch (android.os.RemoteException ex) {
+                        }
+                        if (!app.enabled) {
+                            if (DEBUG) Log.v(TAG, "Enabling app: " + app.packageName);
+                            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) {
+                            if (DEBUG) Log.v(TAG, "Clearing data policy: " + uid);
+                            mNpm.setUidPolicy(uid, POLICY_NONE);
+                        }
+                    }
+                    mHandler.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!");
+
+                            }
+                        }
+                    });
+                    return null;
+                }
+            }).execute();
+        }
+    }
+
+    @Override
+    public void onRunningStateChanged(boolean running) {
+        // No-op.
+    }
+
+    @Override
+    public void onPackageListChanged() {
+        updateAllAppsSummary();
+    }
+
+    @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() {
+        mAppPerms.setSummary(getActivity().getString(R.string.app_permissions_summary,
+                mPermissionsInfo.getRuntimePermAppsGrantedCount(),
+                mPermissionsInfo.getRuntimePermAppsCount()));
+    }
+
+}
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
new file mode 100644
index 0000000..a7dc500
--- /dev/null
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -0,0 +1,217 @@
+/*
+ * 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.preference.PreferenceFragment;
+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..ffb84ef
--- /dev/null
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -0,0 +1,195 @@
+/*
+ * 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.appwidget.AppWidgetManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.content.pm.PackageManager;
+import android.hardware.usb.IUsbManager;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.text.style.BulletSpan;
+import android.util.Log;
+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.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AppLaunchSettings extends AppInfoWithHeader implements OnClickListener {
+
+    private Button mActivitiesButton;
+    private AppWidgetManager mAppWidgetManager;
+
+    private View mRootView;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mAppWidgetManager = AppWidgetManager.getInstance(getActivity());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.app_preferred_settings, container, false);
+
+        final ViewGroup allDetails = (ViewGroup) view.findViewById(R.id.all_details);
+        Utils.forceCustomPadding(allDetails, true /* additive padding */);
+
+        mActivitiesButton = (Button) view.findViewById(R.id.clear_activities_button);
+        mRootView = view;
+
+        return view;
+    }
+
+    @Override
+    protected boolean refreshUi() {
+        retrieveAppEntry();
+        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 = hasPreferredActivities(mPm, mPackageName)
+                || hasUsbDefaults(mUsbManager, mPackageName);
+        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);
+        }
+        return true;
+    }
+
+    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);
+    }
+
+    @Override
+    protected AlertDialog createDialog(int id, int errorCode) {
+        // No dialogs for preferred launch settings.
+        return null;
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mActivitiesButton) {
+            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 autoLaunchTitleView =
+                        (TextView) mRootView.findViewById(R.id.auto_launch_title);
+                TextView autoLaunchView = (TextView) mRootView.findViewById(R.id.auto_launch);
+                resetLaunchDefaultsUi(autoLaunchTitleView, autoLaunchView);
+            }
+        }
+    }
+
+    private 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;
+    }
+
+    private 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);
+        if (localLOGV) {
+            Log.i(TAG, "Have " + prefActList.size() + " number of activities in preferred list");
+        }
+        return prefActList.size() > 0;
+    }
+
+    public static CharSequence getSummary(AppEntry appEntry, IUsbManager usbManager,
+            PackageManager pm, Context context) {
+        String packageName = appEntry.info.packageName;
+        boolean hasPreferred = hasPreferredActivities(pm, packageName)
+                || hasUsbDefaults(usbManager, packageName);
+        return context.getString(hasPreferred
+                ? R.string.launch_defaults_some
+                : R.string.launch_defaults_none);
+    }
+
+    @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/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..1776b3a
--- /dev/null
+++ b/src/com/android/settings/applications/AppPermissionSettings.java
@@ -0,0 +1,228 @@
+/*
+ * 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.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) {
+        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/AppStateNotificationBridge.java b/src/com/android/settings/applications/AppStateNotificationBridge.java
new file mode 100644
index 0000000..0434c0e
--- /dev/null
+++ b/src/com/android/settings/applications/AppStateNotificationBridge.java
@@ -0,0 +1,203 @@
+/*
+ * 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 android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.AppFilter;
+import com.android.settings.applications.ApplicationsState.Session;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.AppRow;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Connects the info provided by ApplicationsState and the NotificationBackend.
+ * Also provides app filters that can use the notification data.
+ */
+public class AppStateNotificationBridge implements ApplicationsState.Callbacks {
+
+    private final ApplicationsState mAppState;
+    private final NotificationBackend mNotifBackend;
+    private final Session mAppSession;
+    private final Callback mCallback;
+    private final BackgroundHandler mHandler;
+    private final MainHandler mMainHandler;
+    private final PackageManager mPm;
+
+    public AppStateNotificationBridge(PackageManager pm, ApplicationsState appState,
+            NotificationBackend notifBackend, Callback callback) {
+        mAppState = appState;
+        mPm = pm;
+        mAppSession = mAppState.newSession(this);
+        mNotifBackend = notifBackend;
+        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();
+        mHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ALL);
+    }
+
+    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.
+    }
+
+    private class MainHandler extends Handler {
+        private static final int MSG_NOTIF_UPDATED = 1;
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_NOTIF_UPDATED:
+                    mCallback.onNotificationInfoUpdated();
+                    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) {
+            List<AppEntry> apps = mAppSession.getAllApps();
+            final int N = apps.size();
+            switch (msg.what) {
+                case MSG_LOAD_ALL:
+                    for (int i = 0; i < N; i++) {
+                        AppEntry app = apps.get(i);
+                        app.extraInfo = mNotifBackend.loadAppRow(mPm, app.info);
+                    }
+                    mMainHandler.sendEmptyMessage(MainHandler.MSG_NOTIF_UPDATED);
+                    break;
+                case MSG_FORCE_LOAD_PKG:
+                    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)) {
+                            app.extraInfo = mNotifBackend.loadAppRow(mPm, app.info);
+                            break;
+                        }
+                    }
+                    mMainHandler.sendEmptyMessage(MainHandler.MSG_NOTIF_UPDATED);
+                    break;
+            }
+        }
+    }
+
+    public interface Callback {
+        void onNotificationInfoUpdated();
+    }
+
+    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/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
new file mode 100644
index 0000000..4b80fdd
--- /dev/null
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -0,0 +1,520 @@
+/*
+ * 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.content.pm.IPackageMoveObserver;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.Message;
+import android.os.RemoteException;
+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.R;
+import com.android.settings.Utils;
+import com.android.settings.applications.ApplicationsState.AppEntry;
+import com.android.settings.applications.ApplicationsState.Callbacks;
+import com.android.settings.DropDownPreference;
+
+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;
+    private static final int MSG_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;
+
+    // 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 int DLG_MOVE_FAILED = DLG_BASE + 3;
+
+    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 CanBeOnSdCardChecker mCanBeOnSdCardChecker;
+    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 mMoveInProgress = false;
+
+    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;
+    private PackageMoveObserver mPackageMoveObserver;
+
+    // Resource strings
+    private CharSequence mInvalidSizeStr;
+    private CharSequence mComputingStr;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mCanBeOnSdCardChecker = new CanBeOnSdCardChecker();
+        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) {
+        boolean selectedExternal = (Boolean) value;
+        boolean isExternal = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
+        if (selectedExternal ^ isExternal) {
+            if (mPackageMoveObserver == null) {
+                mPackageMoveObserver = new PackageMoveObserver();
+            }
+            int moveFlags = selectedExternal ? PackageManager.MOVE_EXTERNAL_MEDIA
+                    : PackageManager.MOVE_INTERNAL;
+            mMoveInProgress = true;
+            refreshButtons();
+            mPm.movePackage(mAppEntry.info.packageName, mPackageMoveObserver, moveFlags);
+        }
+        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();
+        boolean isExternal = (mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
+        mMoveDropDown.setSelectedItem(isExternal ? 1 : 0);
+        return true;
+    }
+
+    private void refreshButtons() {
+        if (!mMoveInProgress) {
+            initMoveDropDown();
+            initDataButtons();
+        } else {
+            mMoveDropDown.setSummary(R.string.moving);
+            mMoveDropDown.setSelectable(false);
+        }
+    }
+
+    private void updateMoveEnabled(boolean enabled) {
+        mMoveDropDown.clearItems();
+        mMoveDropDown.addItem(R.string.storage_type_internal, false);
+        if (enabled) {
+            mMoveDropDown.addItem(R.string.storage_type_external, true);
+        }
+    }
+
+    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() {
+        if (Environment.isExternalStorageEmulated()) {
+            updateMoveEnabled(false);
+            return;
+        }
+        boolean dataOnly = (mPackageInfo == null) && (mAppEntry != null);
+        boolean moveDisable = true;
+        if ((mAppEntry.info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
+            // Always let apps move to internal storage from sdcard.
+            moveDisable = false;
+        } else {
+            mCanBeOnSdCardChecker.init();
+            moveDisable = !mCanBeOnSdCardChecker.check(mAppEntry.info);
+        }
+        updateMoveEnabled(!moveDisable);
+        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 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(mPackageName, mUserId);
+        } else {
+            showDialogInner(DLG_MOVE_FAILED, result);
+        }
+        refreshUi();
+    }
+
+    /*
+     * 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);
+        }
+    }
+
+    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 "";
+    }
+
+    @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();
+            case DLG_MOVE_FAILED:
+                CharSequence msg = getActivity().getString(R.string.move_app_failed_dlg_text,
+                        getMoveErrMsg(errorCode));
+                return new AlertDialog.Builder(getActivity())
+                        .setTitle(getActivity().getText(R.string.move_app_failed_dlg_title))
+                        .setMessage(msg)
+                        .setNeutralButton(R.string.dlg_ok, null)
+                        .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;
+                case MSG_PACKAGE_MOVE:
+                    processMoveMsg(msg);
+                    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);
+        }
+    }
+
+    class PackageMoveObserver extends IPackageMoveObserver.Stub {
+        public void packageMoved(String packageName, int returnCode) throws RemoteException {
+            final Message msg = mHandler.obtainMessage(MSG_PACKAGE_MOVE);
+            msg.arg1 = returnCode;
+            mHandler.sendMessage(msg);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/applications/AppViewHolder.java b/src/com/android/settings/applications/AppViewHolder.java
index d23f187..176ccca 100644
--- a/src/com/android/settings/applications/AppViewHolder.java
+++ b/src/com/android/settings/applications/AppViewHolder.java
@@ -2,7 +2,6 @@
 
 import com.android.settings.R;
 
-import android.content.Context;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,7 +15,7 @@
     public View rootView;
     public TextView appName;
     public ImageView appIcon;
-    public TextView appSize;
+    public TextView summary;
     public TextView disabled;
     public CheckBox checkBox;
 
@@ -30,7 +29,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 +42,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..daa3842 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -1,15 +1,19 @@
 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 +21,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;
@@ -49,11 +56,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 +94,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 +104,9 @@
         long externalSize;
 
         boolean mounted;
-        
+
+        boolean hasLauncherEntry;
+
         String getNormalizedLabel() {
             if (normalizedLabel != null) {
                 return normalizedLabel;
@@ -115,6 +126,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 +137,7 @@
             this.sizeStale = true;
             ensureLabel(context);
         }
-        
+
         void ensureLabel(Context context) {
             if (this.label == null || !this.mounted) {
                 if (!this.apkFile.exists()) {
@@ -136,11 +150,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 +166,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 +221,113 @@
         }
     };
 
-    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() {
+    public static final AppFilter FILTER_THIRD_PARTY = new AppFilter() {
+        public void init() {
+        }
+
+        @Override
+        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 FILTER_ON_SD_CARD = new AppFilter() {
         final CanBeOnSdCardChecker mCanBeOnSdCardChecker
                 = new CanBeOnSdCardChecker();
-        
+
         public void init() {
             mCanBeOnSdCardChecker.init();
         }
-        
+
         @Override
-        public boolean filterApp(ApplicationInfo info) {
-            return mCanBeOnSdCardChecker.check(info);
+        public boolean filterApp(AppEntry entry) {
+            return mCanBeOnSdCardChecker.check(entry.info);
         }
     };
 
-    public static final AppFilter DISABLED_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 ALL_ENABLED_FILTER = new AppFilter() {
+    public static final AppFilter FILTER_ALL_ENABLED = 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_EVERYTHING = new AppFilter() {
+        public void init() {
+        }
+
+        @Override
+        public boolean filterApp(AppEntry entry) {
+            return true;
         }
     };
 
     final Context mContext;
     final PackageManager mPm;
+    final IPackageManager mIpm;
+    final UserManager mUm;
+    final int mOwnerRetrieveFlags;
     final int mRetrieveFlags;
     PackageIntentReceiver mPackageIntentReceiver;
 
@@ -276,11 +339,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 +367,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 +382,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 +413,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 +448,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 +488,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 +521,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 +546,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 +560,10 @@
         }
     }
 
+    Looper getBackgroundLooper() {
+        return mThread.getLooper();
+    }
+
     public class Session {
         final Callbacks mCallbacks;
         boolean mResumed;
@@ -505,6 +606,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 +669,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 +736,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 +774,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 +799,10 @@
                 return;
             }
         }
+        doPauseLocked();
+    }
+
+    void doPauseLocked() {
         mResumed = false;
         if (mPackageIntentReceiver != null) {
             mPackageIntentReceiver.unregisterReceiver();
@@ -690,14 +810,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 +828,7 @@
             return entry;
         }
     }
-    
+
     void ensureIcon(AppEntry entry) {
         if (entry.icon != null) {
             return;
@@ -716,13 +837,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 +861,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 +885,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 +912,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 +947,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 +1035,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 +1044,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 +1091,8 @@
                         }
                     }
                     if (mCurComputingSizePkg == null
-                            || mCurComputingSizePkg.equals(stats.packageName)) {
+                            || (mCurComputingSizePkg.equals(stats.packageName)
+                                    && mCurComputingSizeUserId == stats.userHandle)) {
                         mCurComputingSizePkg = null;
                         sendEmptyMessage(MSG_LOAD_SIZES);
                     }
@@ -966,7 +1136,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 +1148,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 +1240,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/DefaultEmergencyPreference.java b/src/com/android/settings/applications/DefaultEmergencyPreference.java
new file mode 100644
index 0000000..08e6e94
--- /dev/null
+++ b/src/com/android/settings/applications/DefaultEmergencyPreference.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.applications;
+
+import com.android.internal.util.ArrayUtils;
+
+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.preference.ListPreference;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.ArrayMap;
+import android.util.AttributeSet;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A preference for choosing the default emergency app
+ */
+public class DefaultEmergencyPreference extends ListPreference {
+
+    private final ContentResolver mContentResolver;
+
+    public DefaultEmergencyPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mContentResolver = context.getContentResolver();
+        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, ArrayMap<String, CharSequence>>() {
+            @Override
+            protected ArrayMap<String, CharSequence> doInBackground(Void[] params) {
+                return resolveAssistPackageAndQueryApps();
+            }
+
+            @Override
+            protected void onPostExecute(ArrayMap<String, CharSequence> entries) {
+                setEntries(entries.values().toArray(new CharSequence[entries.size()]));
+                setEntryValues(entries.keySet().toArray(new String[entries.size()]));
+
+                setValue(Settings.Secure.getString(mContentResolver,
+                        Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION));
+            }
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
+    private ArrayMap<String, CharSequence> resolveAssistPackageAndQueryApps() {
+        ArrayMap<String, CharSequence> packages = new ArrayMap<>();
+
+        Intent queryIntent = new Intent(TelephonyManager.ACTION_EMERGENCY_ASSISTANCE);
+        PackageManager packageManager = getContext().getPackageManager();
+        List<ResolveInfo> infos = packageManager.queryIntentActivities(queryIntent, 0);
+
+        PackageInfo bestMatch = null;
+        for (int i = 0; i < infos.size(); i++) {
+            if (infos.get(i) == null || infos.get(i).activityInfo == null
+                    || packages.containsKey(infos.get(i).activityInfo.packageName)) {
+                continue;
+            }
+
+            String packageName = infos.get(i).activityInfo.packageName;
+            CharSequence label = infos.get(i).activityInfo.applicationInfo
+                    .loadLabel(packageManager);
+
+            packages.put(packageName, label);
+
+            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.containsKey(defaultPackage);
+        if (bestMatch != null && defaultMissing) {
+            Settings.Secure.putString(mContentResolver,
+                    Settings.Secure.EMERGENCY_ASSISTANCE_APPLICATION,
+                    bestMatch.packageName);
+        }
+
+        return packages;
+    }
+
+    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/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 3aa948d..9f6c969 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,82 @@
         }
     }
 
-    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);
+        mLaunchPreference = findPreference(KEY_LAUNCH);
+        mLaunchPreference.setOnPreferenceClickListener(this);
+        mDataPreference = findPreference(KEY_DATA);
+        mDataPreference.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 +303,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 +346,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 +368,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 +383,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 +413,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(AppLaunchSettings.getSummary(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 +435,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 +452,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 +536,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 +553,7 @@
             mForceStopButton.setOnClickListener(InstalledAppDetails.this);
         }
     }
-    
+
     private void checkForceStop() {
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             // User can't force stop device admin.
@@ -1312,6 +573,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 +699,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..84b9763 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -16,39 +16,22 @@
 
 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.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.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -61,36 +44,39 @@
 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.InstrumentedFragment;
 import com.android.settings.R;
+import com.android.settings.Settings.AllApplicationsActivity;
+import com.android.settings.Settings.NotificationAppListActivity;
 import com.android.settings.SettingsActivity;
-import com.android.settings.UserSpinnerAdapter;
-import com.android.settings.Settings.RunningServicesActivity;
-import com.android.settings.Settings.StorageUseActivity;
-import com.android.settings.applications.ApplicationsState.AppEntry;
-import com.android.settings.deviceinfo.StorageMeasurement;
 import com.android.settings.Utils;
+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;
+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();
@@ -99,7 +85,7 @@
             return;
         }
     }
-    
+
     boolean check(ApplicationInfo info) {
         boolean canBe = false;
         if ((info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0) {
@@ -123,415 +109,450 @@
     }
 }
 
-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";
     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;
 
+    // Filter options used for displayed list of applications
+    // 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_ALL                     = 1;
+    public static final int FILTER_APPS_ENABLED                 = 2;
+    public static final int FILTER_APPS_DISABLED                = 3;
+    public static final int FILTER_APPS_BLOCKED                 = 4;
+    public static final int FILTER_APPS_PRIORITY                = 5;
+    public static final int FILTER_APPS_SENSITIVE               = 6;
+    public static final int FILTER_APPS_PERSONAL                = 7;
+    public static final int FILTER_APPS_WORK                    = 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, spinner not shown in this case
+        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
+    };
+    // 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
+        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
+    };
+
     // 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;
-
-    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;
+    public static final int SORT_ORDER_ALPHA = MENU_OPTIONS_BASE + 1;
+    public static final int SORT_ORDER_SIZE = MENU_OPTIONS_BASE + 2;
+    public static final int RESET_APP_PREFERENCES = MENU_OPTIONS_BASE + 3;
     // sort order
     private int mSortOrder = SORT_ORDER_ALPHA;
-    
+
     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_ALL = 1;
+    public static final int LIST_TYPE_NOTIFICATION = 2;
 
-    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;
 
-    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();
+        String action = intent.getAction();
+        String className = getArguments() != null
+                ? getArguments().getString("classname") : null;
+        if (className == null) {
+            className = intent.getComponent().getClassName();
+        }
+        if (className.equals(AllApplicationsActivity.class.getName())) {
+            mListType = LIST_TYPE_ALL;
+        } else if (className.equals(NotificationAppListActivity.class.getName())) {
+            mListType = LIST_TYPE_NOTIFICATION;
+            mNotifBackend = new NotificationBackend();
+        } 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);
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        // initialize the inflater
+        mInflater = inflater;
+
+        createHeader();
+
+        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;
+        }
+
+        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) {
+            if (UserManager.get(getActivity()).getUserProfiles().size() > 1) {
+                mFilterAdapter.enableFilter(FILTER_APPS_PERSONAL);
+                mFilterAdapter.enableFilter(FILTER_APPS_WORK);
+            }
+        }
+        if (mListType == LIST_TYPE_NOTIFICATION) {
+            mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
+            mFilterAdapter.enableFilter(FILTER_APPS_PRIORITY);
+            mFilterAdapter.enableFilter(FILTER_APPS_SENSITIVE);
+        }
+    }
+
+    private int getDefaultFilter() {
+        if (mListType == LIST_TYPE_MAIN) {
+            return FILTER_APPS_DOWNLOADED_AND_LAUNCHER;
+        }
+        return FILTER_APPS_ALL;
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        switch (mListType) {
+            case LIST_TYPE_MAIN:
+                return MetricsLogger.MANAGE_APPLICATIONS;
+            case LIST_TYPE_ALL:
+                return MetricsLogger.MANAGE_APPLICATIONS_ALL;
+            case LIST_TYPE_NOTIFICATION:
+                return MetricsLogger.MANAGE_APPLICATIONS_NOTIFICATIONS;
+            default:
+                return MetricsLogger.VIEW_UNKNOWN;
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateView();
+        updateOptionsMenu();
+        if (mApplications != null) {
+            mApplications.resume(mSortOrder);
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(EXTRA_SORT_ORDER, mSortOrder);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        if (mApplications != null) {
+            mApplications.pause();
+        }
+    }
+
+    @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.mNotifBridge.forceUpdate(mCurrentPkgName, mCurrentUid);
+            } else {
+                mApplicationsState.requestSize(mCurrentPkgName, UserHandle.getUserId(mCurrentUid));
+            }
+        }
+    }
+
+    // utility method used to start sub activity
+    private void startApplicationDetailsActivity() {
+        if (mListType == LIST_TYPE_NOTIFICATION) {
+            getActivity().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));
+        } else {
+            // 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.
+            Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            intent.setData(Uri.fromParts("package", mCurrentPkgName, null));
+            getActivity().startActivityAsUser(intent,
+                    new UserHandle(UserHandle.getUserId(mCurrentUid)));
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        mOptionsMenu = menu;
+        if (mListType == LIST_TYPE_MAIN) {
+            // Only show advanced options when in the main app list (from dashboard).
+            inflater.inflate(R.menu.manage_apps, menu);
+        }
+        menu.add(0, SORT_ORDER_ALPHA, 1, R.string.sort_order_alpha)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        menu.add(0, SORT_ORDER_SIZE, 2, R.string.sort_order_size)
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        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(SORT_ORDER_ALPHA).setVisible(mSortOrder != SORT_ORDER_ALPHA);
+            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(mSortOrder != SORT_ORDER_SIZE);
+        } else {
+            mOptionsMenu.findItem(SORT_ORDER_ALPHA).setVisible(false);
+            mOptionsMenu.findItem(SORT_ORDER_SIZE).setVisible(false);
+        }
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int menuId = item.getItemId();
+        switch(item.getItemId()) {
+            case SORT_ORDER_ALPHA:
+            case SORT_ORDER_SIZE:
+                mSortOrder = menuId;
+                if (mApplications != null) {
+                    mApplications.rebuild(mSortOrder);
+                }
+                break;
+            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;
+    }
+
+    @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) {
+        mApplications.setFilter(mFilterAdapter.getFilter(position));
+    }
+
+    @Override
+    public void onNothingSelected(AdapterView<?> parent) {
+    }
+
+    public void updateView() {
+        updateOptionsMenu();
+        final Activity host = getActivity();
+        if (host != null) {
+            host.invalidateOptionsMenu();
+        }
+    }
+
+    public void setHasDisabled(boolean hasDisabledApps) {
+        if (mListType == LIST_TYPE_MAIN) {
+            // No filtering on main app list.
+            return;
+        }
+        if (hasDisabledApps) {
+            mFilterAdapter.enableFilter(FILTER_APPS_ENABLED);
+            mFilterAdapter.enableFilter(FILTER_APPS_DISABLED);
+        } else {
+            mFilterAdapter.disableFilter(FILTER_APPS_ENABLED);
+            mFilterAdapter.disableFilter(FILTER_APPS_DISABLED);
+        }
+    }
+
+    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 enableFilter(int filter) {
+            if (mFilterOptions.contains(filter)) return;
+            mFilterOptions.add(filter);
+            Collections.sort(mFilterOptions);
+            mManageApplications.mSpinnerHeader.setVisibility(
+                    mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
+            notifyDataSetChanged();
+        }
+
+        public void disableFilter(int filter) {
+            if (!mFilterOptions.remove((Integer) filter)) {
+                return;
+            }
+            Collections.sort(mFilterOptions);
+            mManageApplications.mSpinnerHeader.setVisibility(
+                    mFilterOptions.size() > 1 ? View.VISIBLE : View.GONE);
+            notifyDataSetChanged();
+        }
 
         @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,18 +565,19 @@
      * The order of applications in the list is mirrored in mAppLocalList
      */
     static class ApplicationsAdapter extends BaseAdapter implements Filterable,
-            ApplicationsState.Callbacks, AbsListView.RecyclerListener {
+            ApplicationsState.Callbacks, AppStateNotificationBridge.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 AppStateNotificationBridge mNotifBridge;
+        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;
 
@@ -571,20 +593,33 @@
             }
 
             @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();
             mFilterMode = filterMode;
+            if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
+                mNotifBridge = new AppStateNotificationBridge(
+                        mContext.getPackageManager(), mState,
+                        manageApplications.mNotifBackend, this);
+            } else {
+                mNotifBridge = null;
+            }
+        }
+
+        public void setFilter(int filter) {
+            mFilterMode = filter;
+            rebuild(true);
         }
 
         public void resume(int sort) {
@@ -593,6 +628,9 @@
                 mResumed = true;
                 mSession.resume();
                 mLastSortMode = sort;
+                if (mNotifBridge != null) {
+                    mNotifBridge.resume();
+                }
                 rebuild(true);
             } else {
                 rebuild(sort);
@@ -603,11 +641,17 @@
             if (mResumed) {
                 mResumed = false;
                 mSession.pause();
+                if (mNotifBridge != null) {
+                    mNotifBridge.pause();
+                }
             }
         }
 
         public void release() {
             mSession.release();
+            if (mNotifBridge != null) {
+                mNotifBridge.release();
+            }
         }
 
         public void rebuild(int sort) {
@@ -617,7 +661,7 @@
             mLastSortMode = sort;
             rebuild(true);
         }
-        
+
         public void rebuild(boolean eraseold) {
             if (DEBUG) Log.i(TAG, "Rebuilding app list...");
             ApplicationsState.AppFilter filterObj;
@@ -628,23 +672,7 @@
             } 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];
             switch (mLastSortMode) {
                 case SORT_ORDER_SIZE:
                     switch (mWhichSize) {
@@ -676,16 +704,26 @@
                 mEntries = null;
             }
             notifyDataSetChanged();
-            mTab.updateStorageUsage();
 
             if (entries == null) {
-                mWaitingForData = true;
-                mTab.mListContainer.setVisibility(View.INVISIBLE);
-                mTab.mLoadingContainer.setVisibility(View.VISIBLE);
+                mManageApplications.mListContainer.setVisibility(View.INVISIBLE);
+                mManageApplications.mLoadingContainer.setVisibility(View.VISIBLE);
             } else {
-                mTab.mListContainer.setVisibility(View.VISIBLE);
-                mTab.mLoadingContainer.setVisibility(View.GONE);
+                mManageApplications.mListContainer.setVisibility(View.VISIBLE);
+                mManageApplications.mLoadingContainer.setVisibility(View.GONE);
             }
+
+            mManageApplications.setHasDisabled(hasDisabledApps());
+        }
+
+        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 +747,30 @@
         }
 
         @Override
+        public void onNotificationInfoUpdated() {
+            if (mFilterMode != mManageApplications.getDefaultFilter()) {
+                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,14 +785,21 @@
         }
 
         @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);
+                        if (mManageApplications.mListType != LIST_TYPE_NOTIFICATION) {
+                            holder.updateSizeText(mManageApplications.mInvalidSizeStr, mWhichSize);
+                        }
                     }
-                    if (holder.entry.info.packageName.equals(mTab.mOwner.mCurrentPkgName)
+                    if (holder.entry.info.packageName.equals(mManageApplications.mCurrentPkgName)
                             && mLastSortMode == SORT_ORDER_SIZE) {
                         // We got the size information for the last app the
                         // user viewed, and are sorting by size...  they may
@@ -757,28 +807,33 @@
                         // the list with the new size to reflect it to the user.
                         rebuild(false);
                     }
-                    mTab.updateStorageUsage();
                     return;
                 }
             }
         }
 
         @Override
+        public void onLauncherInfoChanged() {
+            if (mFilterMode == FILTER_APPS_DOWNLOADED_AND_LAUNCHER) {
+                rebuild(false);
+            }
+        }
+
+        @Override
         public void onAllSizesComputed() {
             if (mLastSortMode == SORT_ORDER_SIZE) {
                 rebuild(false);
             }
-            mTab.updateStorageUsage();
         }
-        
+
         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 +841,12 @@
         public long getItemId(int position) {
             return mEntries.get(position).id;
         }
-        
+
         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 +860,16 @@
                 if (entry.icon != null) {
                     holder.appIcon.setImageDrawable(entry.icon);
                 }
-                holder.updateSizeText(mTab.mInvalidSizeStr, mWhichSize);
+                if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
+                    if (entry.extraInfo != null) {
+                        holder.summary.setText(InstalledAppDetails.getNotificationSummary(
+                                (AppRow) entry.extraInfo, mContext));
+                    } else {
+                        holder.summary.setText("");
+                    }
+                } else {
+                    holder.updateSizeText(mManageApplications.mInvalidSizeStr, mWhichSize);
+                }
                 if ((entry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0) {
                     holder.disabled.setVisibility(View.VISIBLE);
                     holder.disabled.setText(R.string.not_installed);
@@ -814,13 +879,7 @@
                 } 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);
@@ -837,486 +896,4 @@
             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;
-                }
-            }
-        }
-
-        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();
-            }
-        }
-    }
-
-    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/ManagePermissions.java b/src/com/android/settings/applications/ManagePermissions.java
new file mode 100644
index 0000000..8fb3e62
--- /dev/null
+++ b/src/com/android/settings/applications/ManagePermissions.java
@@ -0,0 +1,117 @@
+/*
+ * 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.settings.applications.PermissionsInfo.PermissionGroup;
+
+import java.util.List;
+
+public class ManagePermissions extends SettingsPreferenceFragment
+        implements PermissionsInfo.Callback, OnPreferenceClickListener {
+
+    private static final String TAG = "ManagePermissions";
+
+    private boolean mLoadComplete;
+    private PermissionsInfo mPermissionsInfo;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        mPermissionsInfo = new PermissionsInfo(getActivity(), this);
+    }
+
+    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/PermissionsInfo.java b/src/com/android/settings/applications/PermissionsInfo.java
new file mode 100644
index 0000000..8656d1a
--- /dev/null
+++ b/src/com/android/settings/applications/PermissionsInfo.java
@@ -0,0 +1,188 @@
+/*
+ * 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.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class PermissionsInfo {
+
+    private static final String TAG = "PermissionsInfo";
+
+    private final PackageManager mPm;
+    private final ArrayList<PermissionGroup> mGroups = new ArrayList<>();
+    private final Map<String, PermissionGroup> mGroupLookup = new ArrayMap<>();
+    private final Callback mCallback;
+    private final Context mContext;
+    // Count of apps that request runtime permissions.
+    private int mRuntimePermAppsCt;
+    // Count of apps that are granted runtime permissions.
+    private int mRuntimePermAppsGrantedCt;
+
+    public PermissionsInfo(Context context, Callback callback) {
+        mContext = context;
+        mPm = context.getPackageManager();
+        mCallback = callback;
+        new PermissionsLoader().execute();
+    }
+
+    public List<PermissionGroup> getGroups() {
+        synchronized (mGroups) {
+            return new ArrayList<>(mGroups);
+        }
+    }
+
+    public int getRuntimePermAppsCount() {
+        return mRuntimePermAppsCt;
+    }
+
+    public int getRuntimePermAppsGrantedCount() {
+        return mRuntimePermAppsGrantedCt;
+    }
+
+    private PermissionGroup getOrCreateGroup(String permission) {
+        PermissionGroup group = mGroupLookup.get(permission);
+        if (group == null) {
+            // Some permissions don't have a group, in that case treat them like a group
+            // and create their own PermissionGroup (only if they are runtime).
+            try {
+                PermissionInfo info = mPm.getPermissionInfo(permission, 0);
+                if (info.protectionLevel == PermissionInfo.PROTECTION_DANGEROUS) {
+                    group = new PermissionGroup();
+                    // TODO: Add default permission icon.
+                    group.icon = info.icon != 0 ? info.loadIcon(mPm) : new ShapeDrawable();
+                    group.name = info.name;
+                    group.label = info.loadLabel(mPm).toString();
+                    mGroups.add(group);
+                    mGroupLookup.put(permission, group);
+                }
+            } catch (NameNotFoundException e) {
+                Log.w(TAG, "Unknown permission " + permission, e);
+            }
+        }
+        return group;
+    }
+
+    private class PermissionsLoader extends AsyncTask<Void, Void, Void> {
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            List<PermissionGroupInfo> groups =
+                    mPm.getAllPermissionGroups(PackageManager.GET_META_DATA);
+            // Get the groups.
+            for (PermissionGroupInfo groupInfo : groups) {
+                PermissionGroup group = new PermissionGroup();
+                // TODO: Add default permission icon.
+                group.icon = groupInfo.icon != 0 ? groupInfo.loadIcon(mPm) : new ShapeDrawable();
+                group.name = groupInfo.name;
+                group.label = groupInfo.loadLabel(mPm).toString();
+                synchronized (mGroups) {
+                    mGroups.add(group);
+                }
+            }
+            // Load permissions and which are runtime.
+            for (PermissionGroup group : mGroups) {
+                try {
+                    List<PermissionInfo> permissions =
+                            mPm.queryPermissionsByGroup(group.name, 0);
+                    for (PermissionInfo info : permissions) {
+                        if (info.protectionLevel != PermissionInfo.PROTECTION_DANGEROUS) continue;
+                        mGroupLookup.put(info.name, group);
+                    }
+                } catch (NameNotFoundException e) {
+                    Log.w(TAG, "Problem getting permissions", e);
+                }
+            }
+            // Load granted info.
+            for (UserHandle user : UserManager.get(mContext).getUserProfiles()) {
+                List<PackageInfo> allApps = mPm.getInstalledPackages(
+                        PackageManager.GET_PERMISSIONS, user.getIdentifier());
+                for (PackageInfo info : allApps) {
+                    if (info.applicationInfo.targetSdkVersion <= Build.VERSION_CODES.LOLLIPOP_MR1
+                            || info.requestedPermissions == null)  {
+                        continue;
+                    }
+                    final int N = info.requestedPermissionsFlags.length;
+                    boolean appHasRuntimePerms = false;
+                    boolean appGrantedRuntimePerms = false;
+                    for (int i = 0; i < N; i++) {
+                        boolean granted = (info.requestedPermissionsFlags[i]
+                                & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0;
+                        PermissionGroup group = getOrCreateGroup(info.requestedPermissions[i]);
+                        String key = Integer.toString(info.applicationInfo.uid);
+                        if (group != null && !group.possibleApps.contains(key)) {
+                            appHasRuntimePerms = true;
+                            group.possibleApps.add(key);
+                            if (granted) {
+                                appGrantedRuntimePerms = true;
+                                group.grantedApps.add(key);
+                            }
+                        }
+                    }
+                    if (appHasRuntimePerms) {
+                        mRuntimePermAppsCt++;
+                        if (appGrantedRuntimePerms) {
+                            mRuntimePermAppsGrantedCt++;
+                        }
+                    }
+                }
+            }
+            Collections.sort(mGroups);
+
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            mCallback.onPermissionLoadComplete();
+        }
+    }
+
+    public static class PermissionGroup implements Comparable<PermissionGroup> {
+        public final List<String> possibleApps = new ArrayList<>();
+        public final List<String> grantedApps = new ArrayList<>();
+        public String name;
+        public String label;
+        public Drawable icon;
+
+        @Override
+        public int compareTo(PermissionGroup another) {
+            return label.compareTo(another.label);
+        }
+    }
+
+    public interface Callback {
+        void onPermissionLoadComplete();
+    }
+
+}
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/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..a4cd4a7
--- /dev/null
+++ b/src/com/android/settings/applications/RunningServices.java
@@ -0,0 +1,129 @@
+/*
+ * 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 android.view.animation.AnimationUtils;
+
+import com.android.settings.R;
+
+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);
+        if (haveData) {
+            mRunningProcessesView.setVisibility(View.VISIBLE);
+            mLoadingContainer.setVisibility(View.INVISIBLE);
+        } else {
+            mLoadingContainer.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @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 void handleRunningProcessesAvail() {
+        mLoadingContainer.startAnimation(AnimationUtils.loadAnimation(getActivity(),
+                android.R.anim.fade_out));
+        mRunningProcessesView.startAnimation(AnimationUtils.loadAnimation(getActivity(),
+                android.R.anim.fade_in));
+        mRunningProcessesView.setVisibility(View.VISIBLE);
+        mLoadingContainer.setVisibility(View.GONE);
+    }
+
+    private final Runnable mRunningProcessesAvail = new Runnable() {
+        @Override
+        public void run() {
+            handleRunningProcessesAvail();
+        }
+    };
+
+}
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/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 4466aea..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();
     }
 
@@ -188,7 +190,7 @@
         } else {
             mDeviceNameEdited = true;
             if (mOkButton != null) {
-                mOkButton.setEnabled(s.length() != 0);
+                mOkButton.setEnabled(s.toString().trim().length() != 0);
             }
         }
     }
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 f43d176..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
@@ -192,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 12c1d77..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
@@ -154,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();
 
@@ -200,7 +203,7 @@
             return processed;
         }
 
-        LocalBluetoothManager bluetoothManager = LocalBluetoothManager.getInstance(mContext);
+        LocalBluetoothManager bluetoothManager = Utils.getLocalBtManager(mContext);
         CachedBluetoothDeviceManager cachedDeviceManager =
             bluetoothManager.getCachedDeviceManager();
         CachedBluetoothDevice cachedDevice = cachedDeviceManager.findDevice(mDevice);
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index dd2c9df..b1eed51 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -28,12 +28,9 @@
 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.util.Log;
@@ -44,17 +41,19 @@
 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.R;
 import com.android.settings.SettingsActivity;
 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 +124,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
@@ -506,7 +510,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 f33f4db..0000000
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ /dev/null
@@ -1,787 +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.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 mPhonebookPermissionChoice;
-
-    private int mMessagePermissionChoice;
-
-    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;
-
-    /** 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();
-
-        if (DEBUG) {
-            Log.e(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 (!mProfiles.isEmpty()
-                && (mConnectAttempted + MAX_UUID_DELAY_FOR_AUTO_CONNECT) > 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);
-            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 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/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..ae1b6d0 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -21,6 +21,7 @@
 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.os.Bundle;
 import android.os.Handler;
@@ -32,12 +33,16 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 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 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 +70,11 @@
     private HomePackageReceiver mHomePackageReceiver = new HomePackageReceiver();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DASHBOARD_SUMMARY;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
@@ -148,7 +158,15 @@
     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 {
+                tileIcon.setImageDrawable(context.getPackageManager()
+                        .getResourcesForApplication(tile.iconPkg).getDrawable(tile.iconRes, null));
+            } 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..94833d3 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++) {
+            dest.writeParcelable(userHandle.get(i), 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/ImeiInformation.java b/src/com/android/settings/deviceinfo/ImeiInformation.java
index 253e22a..c4f4bbb 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";
@@ -155,4 +153,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
index 1958f38..a07f7c2 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -47,6 +47,7 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
@@ -85,6 +86,11 @@
     private ArrayList<StorageVolumePreferenceCategory> mCategories = Lists.newArrayList();
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_MEMORY;
+    }
+
+    @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index db3a491..c52f385 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";
@@ -175,6 +172,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.DEVICEINFO_SIM_STATUS;
+    }
+
+    @Override
     protected void onResume() {
         super.onResume();
         if (mPhone != null) {
diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java
index 2c92973..a78d06c 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..87e827e 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);
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/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/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..d796570 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -47,10 +47,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 +66,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[] {
@@ -345,6 +347,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..dbc78c2 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -38,10 +38,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 +53,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 +122,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.FUELGAUGE_POWER_USAGE_SUMMARY;
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         BatteryStatsHelper.dropFile(getActivity(), BATTERY_HISTORY_FILE);
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..428701a
--- /dev/null
+++ b/src/com/android/settings/location/ScanningSettings.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.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";
+
+    @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() {
+        SwitchPreference scanAlwaysAvailable =
+            (SwitchPreference) findPreference(KEY_WIFI_SCAN_ALWAYS_AVAILABLE);
+        scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
+                    Global.WIFI_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 {
+            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..6267570 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -27,11 +27,13 @@
 import android.view.ViewGroup;
 import android.widget.Switch;
 
+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.widget.SwitchBar;
 
-public class AndroidBeam extends Fragment
+public class AndroidBeam extends InstrumentedFragment
         implements SwitchBar.OnSwitchChangeListener {
     private View mView;
     private NfcAdapter mNfcAdapter;
@@ -98,4 +100,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..db957a7 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,24 @@
             // 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;
+                final boolean success =  mBackend.setNotificationsBanned(pkg, uid, banned);
+                if (success) {
+                    updateDependents(banned);
+                }
+                return success;
             }
         });
 
@@ -178,20 +170,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 +241,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/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..ce7ba14 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();
@@ -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..b765b35 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,11 @@
     private Context mContext;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_OTHER_SOUND;
+    }
+
+    @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/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/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java
index 420f974..c2e143a 100644
--- a/src/com/android/settings/notification/ZenModeSettings.java
+++ b/src/com/android/settings/notification/ZenModeSettings.java
@@ -50,6 +50,8 @@
 import android.widget.ScrollView;
 import android.widget.TimePicker;
 
+import com.android.internal.logging.MetricsLogger;
+import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -143,6 +145,11 @@
     private AlertDialog mDialog;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.NOTIFICATION_ZEN_MODE;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mContext = getActivity();
@@ -197,8 +204,8 @@
 
         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.addItem(R.string.zen_mode_from_starred, ZenModeConfig.SOURCE_STAR);
         mStarred.setCallback(new DropDownPreference.Callback() {
             @Override
             public boolean onItemSelected(int pos, Object newValue) {
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..27ccc59 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,15 @@
     private PreferenceCategory mPrintServicesCategory;
 
     private PrintJobsController mPrintJobsController;
-    private UserSpinnerAdapter mProfileSpinnerAdapter;
+    private UserAdapter mProfileSpinnerAdapter;
     private Spinner mSpinner;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.PRINT_SETTINGS;
+    }
+
+    @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 5dbf24f..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;
@@ -501,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) {
@@ -1172,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 {
@@ -1292,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 6abbc3d..c96ce09 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -23,12 +23,14 @@
 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.bluetooth.BluetoothSettings;
 import com.android.settings.deviceinfo.Memory;
 import com.android.settings.deviceinfo.UsbSettings;
@@ -36,6 +38,7 @@
 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;
@@ -66,16 +69,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;
@@ -104,6 +108,7 @@
 
         // Other wireless settinfs
         sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS);
+        sRankMap.put(WifiCallingSettings.class.getName(), RANK_WIRELESS);
 
         // Home
         sRankMap.put(HomeSettings.class.getName(), RANK_HOME);
@@ -127,11 +132,15 @@
         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);
+
         // 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 502480d..102e0bf 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -31,6 +31,7 @@
 import com.android.settings.WallpaperTypeSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
+import com.android.settings.applications.AdvancedAppSettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.deviceinfo.Memory;
 import com.android.settings.deviceinfo.UsbSettings;
@@ -38,6 +39,7 @@
 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;
@@ -49,6 +51,7 @@
 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;
@@ -187,6 +190,13 @@
                         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(UserSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(UserSettings.class.getName()),
@@ -201,6 +211,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()),
@@ -270,6 +287,13 @@
                         NO_DATA_RES_ID,
                         DeviceInfoSettings.class.getName(),
                         R.drawable.ic_settings_about));
+
+        sResMap.put(WifiCallingSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(WifiCallingSettings.class.getName()),
+                        R.xml.wifi_calling_settings,
+                        WifiCallingSettings.class.getName(),
+                        R.drawable.ic_settings_wireless));
     }
 
     private SearchIndexableResources() {
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 3170dae..97762c4 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;
@@ -29,8 +28,7 @@
 import android.telecom.TelecomManager;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.text.TextUtils;
-import android.util.Log;
+import android.telephony.TelephonyManager;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -43,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;
@@ -138,17 +133,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;
             }
         }
@@ -210,6 +202,7 @@
         ArrayList<SubscriptionInfo> callsSubInfoList = new ArrayList<SubscriptionInfo>();
         if (id == CALLS_PICK) {
             final TelecomManager telecomManager = TelecomManager.from(context);
+            final TelephonyManager telephonyManager = TelephonyManager.from(context);
             final Iterator<PhoneAccountHandle> phoneAccounts =
                     telecomManager.getCallCapablePhoneAccounts().listIterator();
 
@@ -219,13 +212,9 @@
                 final PhoneAccount phoneAccount =
                         telecomManager.getPhoneAccount(phoneAccounts.next());
                 list.add((String)phoneAccount.getLabel());
-                // Added check to add entry into callsSubInforList only if phoneAccountId is int
-                // Todo : Might have to change it later based on b/18904714
-                if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) &&
-                        TextUtils.isDigitsOnly(phoneAccount.getAccountHandle().getId())) {
-                    final String phoneAccountId = phoneAccount.getAccountHandle().getId();
-                    final SubscriptionInfo sir = Utils.findRecordBySubId(context,
-                            Integer.parseInt(phoneAccountId));
+                int subId = telephonyManager.getSubIdForPhoneAccount(phoneAccount);
+                if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                    final SubscriptionInfo sir = Utils.findRecordBySubId(context, 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..91dadbb 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -46,6 +46,7 @@
 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;
@@ -116,6 +117,11 @@
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.SIM;
+    }
+
+    @Override
     public void onCreate(final Bundle bundle) {
         super.onCreate(bundle);
 
@@ -230,11 +236,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
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 c28f1ff..e09d650 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -31,7 +31,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 +49,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 +178,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 +259,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 +320,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()) {
@@ -655,25 +634,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,
@@ -684,44 +656,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) {
@@ -730,6 +700,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;
     }
@@ -773,6 +784,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) {
@@ -823,13 +840,9 @@
                         default:
                             continue;
                         }
-                        if (packageName.equals(getActivity().getPackageName())) {
-                            RestrictionUtils.setRestrictions(getActivity(), restrictions, mUser);
-                        } else {
-                            mUserManager.setApplicationRestrictions(packageName,
-                                    RestrictionUtils.restrictionsToBundle(restrictions),
-                                    mUser);
-                        }
+                        mUserManager.setApplicationRestrictions(packageName,
+                                RestrictionUtils.restrictionsToBundle(restrictions),
+                                mUser);
                         break;
                     }
                 }
@@ -851,14 +864,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());
         }
@@ -980,9 +986,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;
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/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..6d0cc5a 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);
             }
         }
@@ -495,7 +507,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 +724,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 +757,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 +788,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 +860,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 +877,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 +893,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/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/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index 9ef269b..2f95bce 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -31,7 +31,6 @@
 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;
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 7516392..04853f1 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -45,13 +45,12 @@
 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;
@@ -93,6 +92,11 @@
     private boolean mUnavailable;
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.VPN;
+    }
+
+    @Override
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
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/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..606ceaa 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -21,7 +21,6 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
deleted file mode 100644
index 1bf1a5c..0000000
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ /dev/null
@@ -1,719 +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) {
-        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();
-        }
-    }
-
-    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
-            summary.append(Summary.get(context, getState(),
-                    networkId == WifiConfiguration.INVALID_NETWORK_ID));
-        } 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..f68410a
--- /dev/null
+++ b/src/com/android/settings/wifi/AccessPointPreference.java
@@ -0,0 +1,165 @@
+/*
+ * 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.app.AppGlobals;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.StateListDrawable;
+import android.net.wifi.WifiConfiguration;
+import android.os.RemoteException;
+import android.os.UserHandle;
+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();
+    }
+
+    public void showAppIcon() {
+        PackageManager pm = getContext().getPackageManager();
+        String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
+        WifiConfiguration mConfig = mAccessPoint.getConfig();
+
+        Drawable drawable = pm.getDefaultActivityIcon();
+        if (mConfig == null) {
+            drawable.setAlpha(0);
+        } else {
+            int userId = UserHandle.getUserId(mConfig.creatorUid);
+            ApplicationInfo appInfo = null;
+            if (mConfig.creatorName.equals(systemName)) {
+                appInfo = getContext().getApplicationInfo();
+            } else {
+                try {
+                    IPackageManager ipm = AppGlobals.getPackageManager();
+                    appInfo = ipm.getApplicationInfo(mConfig.creatorName, 0 /* flags */, userId);
+                } catch (RemoteException rex) {
+                    // use default app icon
+                }
+            }
+            if (appInfo != null) {
+                drawable = appInfo.loadIcon(pm);
+                drawable = pm.getUserBadgedIcon(drawable, new UserHandle(userId));
+            }
+        }
+
+        setIcon(drawable);
+    }
+
+    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..2627bc4 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -20,28 +20,23 @@
 import android.content.Context;
 import android.content.DialogInterface;
 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.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 +55,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 +88,17 @@
         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();
 
         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);
+            preference.setShowSummary(false);
+            preferenceScreen.addPreference(preference);
         }
 
         if(getPreferenceScreen().getPreferenceCount() < 1) {
@@ -103,62 +106,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);
     }
@@ -198,16 +153,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 +188,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 123f64a..0000000
--- a/src/com/android/settings/wifi/Summary.java
+++ /dev/null
@@ -1,44 +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;
-
-class Summary {
-    static String get(Context context, String ssid, DetailedState state, boolean isEphemeral) {
-        if (state == DetailedState.CONNECTED && 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, DetailedState state, boolean isEphemeral) {
-        return get(context, null, state, isEphemeral);
-    }
-}
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/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java
index fb8026a..3c4d912 100644
--- a/src/com/android/settings/wifi/WifiApDialog.java
+++ b/src/com/android/settings/wifi/WifiApDialog.java
@@ -22,6 +22,7 @@
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.AuthAlgorithm;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.InputType;
@@ -32,9 +33,13 @@
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.RadioGroup;
+import android.widget.RadioButton;
 
 import com.android.settings.R;
 
+import android.util.Log;
+
 /**
  * Dialog to configure the SSID and security settings
  * for Access Point operation
@@ -53,8 +58,14 @@
     private TextView mSsid;
     private int mSecurityTypeIndex = OPEN_INDEX;
     private EditText mPassword;
+    private RadioGroup mChannel;
+    private RadioButton mChannel2G;
+    private RadioButton mChannel5G;
 
     WifiConfiguration mWifiConfig;
+    WifiManager mWifiManager;
+
+    private static final String TAG = "WifiApDialog";
 
     public WifiApDialog(Context context, DialogInterface.OnClickListener listener,
             WifiConfiguration wifiConfig) {
@@ -64,6 +75,7 @@
         if (wifiConfig != null) {
             mSecurityTypeIndex = getSecurityTypeIndex(wifiConfig);
         }
+        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
     }
 
     public static int getSecurityTypeIndex(WifiConfiguration wifiConfig) {
@@ -85,6 +97,16 @@
          */
         config.SSID = mSsid.getText().toString();
 
+        //obtain the band configure
+        if (mChannel2G.isChecked()) {
+            config.apBand = 0;
+        } else if(mChannel5G.isChecked()) {
+            config.apBand = 1;
+        } else {
+            Log.e("TAG", "AP band configure error!");
+            return null;
+        }
+
         switch (mSecurityTypeIndex) {
             case OPEN_INDEX:
                 config.allowedKeyManagement.set(KeyMgmt.NONE);
@@ -118,15 +140,36 @@
         mSsid = (TextView) mView.findViewById(R.id.ssid);
         mPassword = (EditText) mView.findViewById(R.id.password);
 
+        mChannel = (RadioGroup) mView.findViewById(R.id.choose_channel);
+        mChannel2G = (RadioButton) mView.findViewById(R.id.ap_2G_band);
+        mChannel5G = (RadioButton) mView.findViewById(R.id.ap_5G_band);
+
+        String countryCode = mWifiManager.getCountryCode();
+        if (!mWifiManager.is5GHzBandSupported() || countryCode == null) {
+            //If no country code, 5GHz AP is forbidden
+            Log.e(TAG," NO country code, forbid 5GHz");
+            mChannel5G.setVisibility(View.INVISIBLE);
+            mWifiConfig.apBand = 0;
+        } else {
+            mChannel5G.setVisibility(View.VISIBLE);
+        }
+
+
         setButton(BUTTON_SUBMIT, context.getString(R.string.wifi_save), mListener);
         setButton(DialogInterface.BUTTON_NEGATIVE,
         context.getString(R.string.wifi_cancel), mListener);
 
         if (mWifiConfig != null) {
             mSsid.setText(mWifiConfig.SSID);
+            if (mWifiConfig.apBand == 0) {
+                mChannel2G.setChecked(true);
+            } else {
+                mChannel5G.setChecked(true);
+            }
+
             mSecurity.setSelection(mSecurityTypeIndex);
             if (mSecurityTypeIndex == WPA2_INDEX) {
-                  mPassword.setText(mWifiConfig.preSharedKey);
+                mPassword.setText(mWifiConfig.preSharedKey);
             }
         }
 
@@ -141,6 +184,15 @@
         validate();
     }
 
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        mPassword.setInputType(
+                InputType.TYPE_CLASS_TEXT |
+                (((CheckBox) mView.findViewById(R.id.show_password)).isChecked() ?
+                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
+                InputType.TYPE_TEXT_VARIATION_PASSWORD));
+    }
+
     private void validate() {
         if ((mSsid != null && mSsid.length() == 0) ||
                    ((mSecurityTypeIndex == WPA2_INDEX)&&
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 5462d26..cc8481d 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;
@@ -103,9 +99,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
@@ -152,12 +145,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();
@@ -188,18 +180,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();
@@ -210,12 +191,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);
@@ -242,7 +223,7 @@
                 }
             }
 
-            if ((mAccessPoint.networkId == INVALID_NETWORK_ID && !mAccessPoint.isActive())
+            if ((!mAccessPoint.isSaved() && !mAccessPoint.isActive())
                     || mEdit) {
                 showSecurityFields();
                 showIpConfigFields();
@@ -259,16 +240,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) {
-                        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) {
@@ -302,15 +282,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));
@@ -355,7 +334,7 @@
         }
 
         if ((mSsidView != null && mSsidView.length() == 0) ||
-            ((mAccessPoint == null || mAccessPoint.networkId == INVALID_NETWORK_ID) &&
+            ((mAccessPoint == null || !mAccessPoint.isSaved()) &&
             passwordInvalid)) {
             enabled = false;
         } else {
@@ -369,7 +348,7 @@
     }
 
     /* package */ WifiConfiguration getConfig() {
-        if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID && !mEdit) {
+        if (mAccessPoint != null && mAccessPoint.isSaved() && !mEdit) {
             return null;
         }
 
@@ -380,11 +359,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) {
@@ -611,13 +590,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;
@@ -630,7 +602,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);
             }
         }
@@ -654,7 +626,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();
@@ -796,7 +768,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();
         }
 
@@ -848,7 +820,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();
         }
 
@@ -999,14 +971,12 @@
     /**
      * Make the characters of the password visible if show_password is checked.
      */
-    private void updatePasswordVisibility(boolean checked) {
-        int pos = mPasswordView.getSelectionEnd();
-        mPasswordView.setInputType(
-                InputType.TYPE_CLASS_TEXT | (checked ?
-                        InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
-                            InputType.TYPE_TEXT_VARIATION_PASSWORD));
-        if (pos >= 0) {
-            ((EditText)mPasswordView).setSelection(pos);
-        }
+    public void updatePassword() {
+        TextView passwdView = (TextView) mView.findViewById(R.id.password);
+        passwdView.setInputType(
+                InputType.TYPE_CLASS_TEXT |
+                (((CheckBox) mView.findViewById(R.id.show_password)).isChecked() ?
+                InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
+                InputType.TYPE_TEXT_VARIATION_PASSWORD));
     }
 }
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 942c5dd..1e8a981 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;
@@ -74,6 +75,11 @@
         }
     }
 
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+            super.onRestoreInstanceState(savedInstanceState);
+            mController.updatePassword();
+    }
+
     @Override
     public boolean isEdit() {
         return mEdit;
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/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 54ebc6d..238db69 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -18,32 +18,22 @@
 
 import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
 import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
-
 import android.app.Activity;
-import android.app.ActivityManager;
 import android.app.Dialog;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.location.LocationManager;
 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.UserHandle;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.util.Log;
@@ -57,19 +47,20 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.internal.logging.MetricsLogger;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
 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.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 +71,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";
 
@@ -94,26 +86,20 @@
     private static final int MENU_ID_FORGET = Menu.FIRST + 7;
     private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
     private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
+    private static final int MENU_ID_APPS = Menu.FIRST + 10;
 
     public static final int WIFI_DIALOG_ID = 1;
     /* package */ static final int WPS_PBC_DIALOG_ID = 2;
     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,16 +108,14 @@
     // 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;
 
     private TextView mEmptyView;
 
+    private boolean showAppIcons = false;
+    private MenuItem showAppMenuItem = null;
+
     // this boolean extra specifies whether to disable the Next button when not connected. Used by
     // account creation outside of setup wizard.
     private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
@@ -147,98 +131,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 +224,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 +273,7 @@
             mWifiEnabler.resume(activity);
         }
 
-        activity.registerReceiver(mReceiver, mFilter);
-        updateAccessPoints();
+        mWifiTracker.startTracking();
     }
 
     @Override
@@ -378,8 +283,7 @@
             mWifiEnabler.pause();
         }
 
-        getActivity().unregisterReceiver(mReceiver);
-        mScanner.pause();
+        mWifiTracker.stopTracking();
     }
 
     @Override
@@ -395,7 +299,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)
@@ -413,10 +317,17 @@
                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+        showAppMenuItem = menu.add(Menu.NONE, MENU_ID_APPS, 0, R.string.wifi_menu_apps);
+        showAppMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
         ta.recycle();
     }
 
     @Override
+    protected int getMetricsCategory() {
+        return MetricsLogger.WIFI;
+    }
+
+    @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
 
@@ -458,12 +369,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;
@@ -489,6 +399,16 @@
                             null);
                 }
                 return true;
+            case MENU_ID_APPS:
+                showAppIcons = !showAppIcons;
+
+                if (showAppIcons) {
+                    showAppMenuItem.setTitle(R.string.wifi_menu_apps_strength);
+                } else {
+                    showAppMenuItem.setTitle(R.string.wifi_menu_apps);
+                }
+                onAccessPointsChanged();
+                return true;
         }
         return super.onOptionsItemSelected(item);
     }
@@ -499,29 +419,24 @@
             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).
+                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 +452,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 +481,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;
@@ -637,7 +551,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,15 +562,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.
                 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);
@@ -664,7 +575,14 @@
                 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());
+                        if (showAppIcons) {
+                            preference.showAppIcon();
+                        }
+
+                        getPreferenceScreen().addPreference(preference);
+                        accessPoint.setListener(this);
                     }
                 }
                 break;
@@ -681,6 +599,11 @@
                 setOffMessage();
                 break;
         }
+        // Update "Saved Networks" menu option.
+        if (savedNetworksExist != mWifiTracker.doSavedNetworksExist()) {
+            savedNetworksExist = !savedNetworksExist;
+            getActivity().invalidateOptionsMenu();
+        }
     }
 
     protected TextView initEmptyView() {
@@ -714,127 +637,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>();
-
-        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 (config.selfAdded && config.numAssociation == 0) {
-                    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);
-                    }
-                    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;
@@ -843,10 +653,11 @@
                 setOffMessage();
                 break;
         }
+    }
 
-        mLastInfo = null;
-        mLastNetworkInfo = null;
-        mScanner.pause();
+    @Override
+    public void onConnectedChanged() {
+        changeNextButtonState(mWifiTracker.isConnected());
     }
 
     /**
@@ -878,8 +689,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) {
@@ -893,42 +704,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);
     }
 
@@ -936,9 +743,7 @@
      * Refreshes acccess points and ask Wifi module to scan networks again.
      */
     /* package */ void refreshAccessPoints() {
-        if (mWifiManager.isWifiEnabled()) {
-            mScanner.resume();
-        }
+        mWifiTracker.resumeScanning();
 
         getPreferenceScreen().removeAll();
     }
@@ -947,13 +752,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 {
@@ -965,18 +771,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
@@ -984,6 +786,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
@@ -998,16 +810,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);
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
index c4a5c96..5716bec 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -17,19 +17,14 @@
 package com.android.settings.wifi;
 
 import android.content.Intent;
-import android.content.res.TypedArray;
-import android.database.DataSetObserver;
 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;
 
@@ -37,9 +32,9 @@
 
 /**
  * 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 {
 
@@ -49,7 +44,6 @@
     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;
 
@@ -79,7 +73,9 @@
 
         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 View requiredInfo =
+                    inflater.inflate(R.layout.setup_wifi_required_info, list, false);
+            list.addHeaderView(requiredInfo, null, false);
         }
 
         return view;
@@ -98,15 +94,12 @@
         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 +114,8 @@
     }
 
     @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
@@ -151,17 +134,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/WifiStatusTest.java b/src/com/android/settings/wifi/WifiStatusTest.java
index 48921d7..85afb7c 100644
--- a/src/com/android/settings/wifi/WifiStatusTest.java
+++ b/src/com/android/settings/wifi/WifiStatusTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.wifi;
 
 import com.android.settings.R;
+import com.android.settingslib.wifi.AccessPoint;
 
 import android.net.wifi.ScanResult;
 import java.net.HttpURLConnection;
@@ -297,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);
         }
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-bn-rBD/strings.xml b/tests/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000..c0b4696
--- /dev/null
+++ b/tests/res/values-bn-rBD/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">"খুঁজে নেওয়ার যোগ্য"</string>
+    <string name="start_scan" msgid="6035699220942169744">"স্ক্যান শুরু করুন"</string>
+    <string name="stop_scan" msgid="527546916633745779">"স্ক্যান বন্ধ করুন"</string>
+    <string name="operator_hello" msgid="292208161864910159">"হ্যালো অপারেটর!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"অপারেটর"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"অপারেটর হুক যা পছন্দের কার্যকলাপ শুরু করতে ব্যবহার করা যেতে পারে"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"হ্যালো প্রস্তুতকর্তা!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"প্রস্তুতকর্তা"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"প্রস্তুতকর্তা হুক যা পছন্দের কার্যকলাপ শুরু করতে ব্যবহার করা যেতে পারে"</string>
+</resources>
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-eu-rES/strings.xml b/tests/res/values-eu-rES/strings.xml
new file mode 100644
index 0000000..904bd9f
--- /dev/null
+++ b/tests/res/values-eu-rES/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">"Ikusgai"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Hasi aztertzen"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Gelditu azterketa"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Kaixo, operadore hori!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operadorea"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operadorearen lotura, jarduerak nahieran hasteko erabil daitekeena"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Kaixo, fabrikatzaile hori!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabrikatzailea"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Fabrikatzailearen lotura, jarduerak nahieran hasteko erabil daitekeena"</string>
+</resources>
diff --git a/tests/res/values-gl-rES/strings.xml b/tests/res/values-gl-rES/strings.xml
new file mode 100644
index 0000000..260e36d
--- /dev/null
+++ b/tests/res/values-gl-rES/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">"Detectable"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Iniciar escaneo"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Deter escaneo"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Ola, operador."</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operador"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Gancho do operador que se pode usar para iniciar a actividade escollida"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Ola, fabricante."</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Fabricante"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Gancho do fabricante que se pode usar para iniciar a actividade escollida"</string>
+</resources>
diff --git a/tests/res/values-is-rIS/strings.xml b/tests/res/values-is-rIS/strings.xml
new file mode 100644
index 0000000..9fe14d5
--- /dev/null
+++ b/tests/res/values-is-rIS/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">"Sýnilegt"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Hefja skönnun"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Stöðva skönnun"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Halló, símafyrirtæki!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Símafyrirtæki"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Símafyrirtækishlið sem hægt er að nota til að ræsa hvaða virkni sem er"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Halló, framleiðandi!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Framleiðandi"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Framleiðandahlið sem hægt er að nota til að ræsa hvaða virkni sem er"</string>
+</resources>
diff --git a/tests/res/values-kk-rKZ/strings.xml b/tests/res/values-kk-rKZ/strings.xml
new file mode 100644
index 0000000..8d24968
--- /dev/null
+++ b/tests/res/values-kk-rKZ/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">"Табу мүмкіндігі бар"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Іздеуді бастау"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Іздеуді тоқтату"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Сәлем, Operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Таңдалған әрекетті іске қосу үшін пайдалануға болатын Operator хугы"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Сәлем, Manufacturer!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Manufacturer"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Таңдалған әрекетті іске қосу үшін пайдалануға болатын Manufacturer хугы"</string>
+</resources>
diff --git a/tests/res/values-kn-rIN/strings.xml b/tests/res/values-kn-rIN/strings.xml
new file mode 100644
index 0000000..1d1b520
--- /dev/null
+++ b/tests/res/values-kn-rIN/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">"ಅನ್ವೇಷಿಸಬಹುದಾದ"</string>
+    <string name="start_scan" msgid="6035699220942169744">"ಸ್ಕ್ಯಾನ್ ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="stop_scan" msgid="527546916633745779">"ಸ್ಕ್ಯಾನ್ ನಿಲ್ಲಿಸಿ"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ಹಲೋ ಆಪರೇಟರ್!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ಆಪರೇಟರ್"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ಆಯ್ಕೆಯ ಚಟುವಟಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಳಸಬಹುದಾದ ಆಪರೇಟರ್ ಹುಕ್"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ಹಲೋ ತಯಾರಕರೇ!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"ತಯಾರಕರು"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"ಆಯ್ಕೆಯ ಚಟುವಟಿಕೆಯನ್ನು ಪ್ರಾರಂಭಿಸಲು ಬಳಸಬಹುದಾದ ತಯಾರಕರ ಹುಕ್"</string>
+</resources>
diff --git a/tests/res/values-mk-rMK/strings.xml b/tests/res/values-mk-rMK/strings.xml
new file mode 100644
index 0000000..c9514c6
--- /dev/null
+++ b/tests/res/values-mk-rMK/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">"Видлив"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Започни скенирање"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Запри скенирање"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Здраво операторе!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Оператор"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Кука на оператор што може да се употреби за да се започне активност по избор"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Здраво производителе!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Производител"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Кука на производител што може да се употреби за да се започне активност по избор"</string>
+</resources>
diff --git a/tests/res/values-ml-rIN/strings.xml b/tests/res/values-ml-rIN/strings.xml
new file mode 100644
index 0000000..2d4647d
--- /dev/null
+++ b/tests/res/values-ml-rIN/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">"കണ്ടെത്താനാകുന്നത്"</string>
+    <string name="start_scan" msgid="6035699220942169744">"സ്കാൻ ചെയ്യാൻ ആരംഭിക്കുക"</string>
+    <string name="stop_scan" msgid="527546916633745779">"സ്‌കാൻ ചെയ്യുന്നത് നിർത്തുക"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ഹലോ, ഓപ്പറേറ്റർ!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ഓപ്പറേറ്റർ"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"തിരഞ്ഞെടുക്കൽ പ്രവർത്തനം ആരംഭിക്കാൻ ഉപയോഗിക്കാവുന്ന ഓപ്പറേറ്റർ ഹുക്ക്"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ഹലോ, നിർമ്മാതാവെ!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"നിർമ്മാതാവ്"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"തിരഞ്ഞെടുക്കൽ പ്രവർത്തനം ആരംഭിക്കാൻ ഉപയോഗിക്കാവുന്ന നിർമ്മാതാവിന്റെ ഹുക്ക്"</string>
+</resources>
diff --git a/tests/res/values-mr-rIN/strings.xml b/tests/res/values-mr-rIN/strings.xml
new file mode 100644
index 0000000..cf57b96
--- /dev/null
+++ b/tests/res/values-mr-rIN/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">"शोधण्यायोग्य"</string>
+    <string name="start_scan" msgid="6035699220942169744">"स्कॅन प्रारंभ करा"</string>
+    <string name="stop_scan" msgid="527546916633745779">"स्‍कॅन थांबवा"</string>
+    <string name="operator_hello" msgid="292208161864910159">"हॅलो वाहक!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"वाहक"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"पसंतीचा क्रियाकलाप प्रारंभ करण्‍यासाठी वापरले जाऊ शकणारे वाहक हुक"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"निर्माता हॅलो!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"निर्माता"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"पसंतीचा क्रियाकलाप प्रारंभ करण्‍यासाठी वापरले जाऊ शकणारे निर्माता हुक"</string>
+</resources>
diff --git a/tests/res/values-my-rMM/strings.xml b/tests/res/values-my-rMM/strings.xml
new file mode 100644
index 0000000..6c207df
--- /dev/null
+++ b/tests/res/values-my-rMM/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">"ရှာတွေ့နိုင်သော"</string>
+    <string name="start_scan" msgid="6035699220942169744">"စကင် စတင်ရန်"</string>
+    <string name="stop_scan" msgid="527546916633745779">"စကင် ရပ်ရန်"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ဟဲလို အော်ပရေတာ!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"အော်ပရေတာ"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ရွေးချယ်မှုကို စတင်ရန် သုံး၍ ရနုင်သည့် အော်ပရေတာ၏ ချိတ်"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ဟဲလို ထုတ်လုပ်သူ!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"ထုတ်လုပ်သူ"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"ရွေးချယ်မှုကို စတင်ရန် သုံး၍ ရနုင်သည့် ထုတ်လုပ်သူ၏ ချိတ်"</string>
+</resources>
diff --git a/tests/res/values-ta-rIN/strings.xml b/tests/res/values-ta-rIN/strings.xml
new file mode 100644
index 0000000..c05bfcb
--- /dev/null
+++ b/tests/res/values-ta-rIN/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">"கண்டறியப்படலாம்"</string>
+    <string name="start_scan" msgid="6035699220942169744">"ஸ்கேனைத் தொடங்கு"</string>
+    <string name="stop_scan" msgid="527546916633745779">"ஸ்கேனை நிறுத்து"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ஹலோ ஆபரேட்டரே!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ஆபரேட்டர்"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"தேர்வுகளின் நடவடிக்கையைத் தொடங்கப் பயன்படுத்தக்கூடிய ஆபரேட்டர் பொறி"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ஹலோ உற்பத்தியாளரே!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"உற்பத்தியாளர்"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"தேர்வுகளின் நடவடிக்கையைத் தொடங்கப் பயன்படுத்தக்கூடிய உற்பத்தியாளர் பொறி"</string>
+</resources>
diff --git a/tests/res/values-te-rIN/strings.xml b/tests/res/values-te-rIN/strings.xml
new file mode 100644
index 0000000..445f421
--- /dev/null
+++ b/tests/res/values-te-rIN/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">"కనుగొనదగినది"</string>
+    <string name="start_scan" msgid="6035699220942169744">"స్కాన్‌ని ప్రారంభించండి"</string>
+    <string name="stop_scan" msgid="527546916633745779">"స్కాన్‌ని ఆపివేయండి"</string>
+    <string name="operator_hello" msgid="292208161864910159">"హలో ఆపరేటర్!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"ఆపరేటర్"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"ఎంచుకున్న కార్యాచరణను ప్రారంభించడానికి ఉపయోగించగల దాన్ని ఆపరేటర్ నియంత్రించగలరు"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"హలో తయారీదారు!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"తయారీదారు"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"ఎంచుకున్న కార్యాచరణను ప్రారంభించడానికి ఉపయోగించగల దాన్ని తయారీదారు నియంత్రించగలరు"</string>
+</resources>
diff --git a/tests/res/values-ur-rPK/strings.xml b/tests/res/values-ur-rPK/strings.xml
new file mode 100644
index 0000000..de4e42e
--- /dev/null
+++ b/tests/res/values-ur-rPK/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">"قابل دریافت"</string>
+    <string name="start_scan" msgid="6035699220942169744">"اسکین شروع کریں"</string>
+    <string name="stop_scan" msgid="527546916633745779">"اسکین روکیں"</string>
+    <string name="operator_hello" msgid="292208161864910159">"ہیلو آپریٹر!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"آپریٹر"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"آپریٹر ہک جس کا استعمال پسند کی سرگرمی شروع کرنے کیلئے کیا جا سکتا ہے"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"ہیلو مینوفیکچرر!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"مینوفیکچرر"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"مینوفیکچرر ہک جس کا استعمال پسند کی سرگرمی شروع کرنے کیلئے کیا جا سکتا ہے"</string>
+</resources>
diff --git a/tests/res/values-uz-rUZ/strings.xml b/tests/res/values-uz-rUZ/strings.xml
new file mode 100644
index 0000000..2fec9d2
--- /dev/null
+++ b/tests/res/values-uz-rUZ/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">"Ko‘rinadi"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Qidiruvni boshlash"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Qidiruvni to‘xtatish"</string>
+    <string name="operator_hello" msgid="292208161864910159">"Salom, operator!"</string>
+    <string name="operator_settings_title" msgid="1410094511974808567">"Operator"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"Operatorning tanlangan amalni ishga tushiruvchi hiylasi"</string>
+    <string name="manufacturer_hello" msgid="7525744633645544137">"Salom, ishlab chiqaruvchi!"</string>
+    <string name="manufacturer_settings_title" msgid="2503105049808838612">"Ishlab chiqaruvchi"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"Ishlab chiqaruvchining tanlangan amalni ishga tushiruvchi hiylasi"</string>
+</resources>