diff --git a/Android.mk b/Android.mk
index fe8ed2d..c8b81dc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -2,7 +2,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common
-LOCAL_STATIC_JAVA_LIBRARIES := guava android-support-v4 jsr305
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 
 LOCAL_MODULE_TAGS := optional
 
@@ -13,6 +13,8 @@
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
+LOCAL_AAPT_FLAGS += -c zz_ZZ
+
 include $(BUILD_PACKAGE)
 
 # Use the folloing include to make our test apk.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 14207db..c41c40c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,6 +29,7 @@
     <uses-permission android:name="android.permission.ACCESS_WIMAX_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIMAX_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="com.android.certinstaller.INSTALL_AS_USER" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
@@ -62,13 +63,14 @@
     <uses-permission android:name="android.permission.READ_PROFILE" />
     <uses-permission android:name="android.permission.CONFIGURE_WIFI_DISPLAY" />
     <uses-permission android:name="android.permission.SET_TIME" />
+    <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
             android:theme="@android:style/Theme.Holo"
-            android:uiOptions="splitActionBarWhenNarrow"
             android:hardwareAccelerated="true"
+            android:requiredForAllUsers="true"
             android:supportsRtl="true">
 
         <!-- Settings -->
@@ -122,6 +124,7 @@
         <!-- Top-level settings -->
 
         <activity android:name="Settings$WifiSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity=""
                 android:label="@string/wifi_settings"
                 android:configChanges="orientation|keyboardHidden|screenSize"
@@ -141,6 +144,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".wifi.WifiSettings"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/wifi_settings"
                 android:targetActivity="Settings$WifiSettingsActivity"
@@ -153,6 +157,7 @@
         </activity-alias>
 
         <activity android:name=".wifi.WifiPickerActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
@@ -163,10 +168,11 @@
         </activity>
 
         <activity android:name=".wifi.WifiSetupActivity"
-            android:theme="@style/setup_wizard_theme"
-            android:label="@string/wifi_setup_wizard_title"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:theme="@style/setup_wizard_theme"
+                android:label="@string/wifi_setup_wizard_title"
                 android:icon="@drawable/empty_icon"
-            android:clearTaskOnLaunch="true">
+                android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="com.android.net.wifi.SETUP_WIFI_NETWORK" />
@@ -175,11 +181,12 @@
         </activity>
 
         <activity android:name=".wifi.WifiSettingsForSetupWizardXL"
-                  android:theme="@android:style/Theme.Holo.NoActionBar"
-                  android:screenOrientation="behind"
-                  android:clearTaskOnLaunch="true"
-                  android:windowSoftInputMode="adjustResize"
-                  android:exported="true" />
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:theme="@android:style/Theme.Holo.NoActionBar"
+                android:screenOrientation="behind"
+                android:clearTaskOnLaunch="true"
+                android:windowSoftInputMode="adjustResize"
+                android:exported="true" />
 
         <activity android:name="Settings$AdvancedWifiSettingsActivity"
                 android:taskAffinity="com.android.settings"
@@ -254,7 +261,6 @@
 
         <activity android:name="ApnSettings"
                 android:label="@string/apn_settings"
-                android:uiOptions="none"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:launchMode="singleTask">
             <intent-filter>
@@ -266,6 +272,7 @@
         </activity>
 
         <activity android:name="Settings$BluetoothSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/bluetooth_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -284,6 +291,7 @@
 
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".bluetooth.BluetoothSettings"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/bluetooth_settings_title"
                 android:targetActivity="Settings$BluetoothSettingsActivity"
                 android:exported="true"
@@ -295,6 +303,7 @@
         </activity-alias>
 
         <activity android:name=".bluetooth.DevicePickerActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:theme="@android:style/Theme.Holo.DialogWhenLarge"
                 android:label="@string/device_picker"
                 android:clearTaskOnLaunch="true">
@@ -306,7 +315,6 @@
 
         <activity android:name="Settings$TetherSettingsActivity"
                 android:label="@string/tether_settings_title_all"
-                android:uiOptions="none"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
             <intent-filter>
@@ -328,7 +336,6 @@
         <!-- Keep compatibility with old shortcuts. -->
         <activity-alias android:name=".TetherSettings"
                   android:label="@string/tether_settings_title_all"
-                  android:uiOptions="none"
                   android:clearTaskOnLaunch="true"
                   android:exported="true"
                   android:targetActivity="Settings$TetherSettingsActivity">
@@ -343,6 +350,7 @@
         </activity-alias>
 
         <activity android:name="Settings$WifiP2pSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings$WifiSettingsActivity">
             <intent-filter>
@@ -505,7 +513,6 @@
         <activity android:name="Settings$UserDictionarySettingsActivity"
                 android:label="@string/user_dict_settings_titlebar"
                 android:taskAffinity="com.android.settings"
-                android:uiOptions="none"
                 android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -649,8 +656,7 @@
         <activity android:name="Settings$ManageApplicationsActivity"
                 android:label="@string/applications_settings"
                 android:taskAffinity=""
-                android:excludeFromRecents="true"
-                android:uiOptions="none">
+                android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -730,6 +736,16 @@
             </intent-filter>
         </activity-alias>
 
+        <activity android:name=".users.AppRestrictionsFragment$Activity"
+                android:label="@string/application_info_label"
+                android:exported="true"
+                android:taskAffinity="">
+            <intent-filter>
+                <action android:name="com.android.settings.APP_RESTRICTIONS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
                 android:label="@string/runningservices_settings_title"
@@ -765,9 +781,41 @@
                 android:resource="@id/application_settings" />
         </activity>
 
+        <activity android:name="Settings$NotificationStationActivity"
+                android:label="@string/sound_category_notification_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.NotificationStation" />
+        </activity>
+
+        <activity android:name="Settings$AppOpsSummaryActivity"
+                android:label="@string/app_ops_settings"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.settings.APP_OPS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <!-- Not yet ready to expose.
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="com.android.settings.SHORTCUT" />
+                -->
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.applications.AppOpsSummary" />
+            <!--
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/application_settings" /> -->
+        </activity>
+        
         <activity android:name="Settings$LocationSettingsActivity"
                 android:label="@string/location_settings_title"
-                android:uiOptions="none"
                 android:configChanges="orientation|keyboardHidden|screenSize"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -975,7 +1023,6 @@
 
         <activity android:name="Settings$StorageSettingsActivity"
                 android:label="@string/storage_settings_title"
-                android:uiOptions="none"
                 android:taskAffinity="com.android.settings"
                 android:parentActivityName="Settings">
             <intent-filter>
@@ -1146,6 +1193,15 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".wifi.WifiScanModeActivity"
+                  android:excludeFromRecents="true"
+                  android:theme="@style/Transparent">
+            <intent-filter>
+                <action android:name="android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <activity android:name=".bluetooth.RequestPermissionHelperActivity"
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
@@ -1182,7 +1238,7 @@
 
         <activity android:name="ActivityPicker"
                 android:label="@string/activity_picker_label"
-                android:theme="@*android:style/Theme.Dialog.Alert"
+                android:theme="@*android:style/Theme.Holo.Dialog.Alert"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter>
                 <action android:name="android.intent.action.PICK_ACTIVITY" />
@@ -1205,6 +1261,7 @@
         </activity>
 
         <activity android:name="Settings$WifiDisplaySettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/wifi_display_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -1342,7 +1399,6 @@
 
         <activity android:name="Settings$PowerUsageSummaryActivity"
                 android:label="@string/power_usage_summary_title"
-                android:uiOptions="none"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
             <intent-filter>
@@ -1371,8 +1427,7 @@
         <activity android:name="Settings$AccountSyncSettingsActivity"
             android:label="@string/account_sync_settings_title"
             android:taskAffinity=""
-            android:parentActivityName="Settings"
-            android:uiOptions="none">
+            android:parentActivityName="Settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -1454,7 +1509,6 @@
 
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
-                android:uiOptions="none"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
             <intent-filter>
@@ -1469,6 +1523,7 @@
         </activity>
 
         <activity android:name="Settings$DreamSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
                 android:label="@string/screensaver_settings_title"
                 android:taskAffinity=""
                 android:excludeFromRecents="true">
@@ -1484,9 +1539,51 @@
                 android:resource="@id/display_settings" />
         </activity>
 
+        <activity android:name="Settings$UserSettingsActivity"
+                android:uiOptions="splitActionBarWhenNarrow"
+                android:label="@string/user_settings_title"
+                android:taskAffinity=""
+                android:excludeFromRecents="true">
+            <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"
+                android:value="com.android.settings.users.UserSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                android:resource="@id/user_settings" />
+        </activity>
+
+        <activity android:name="Settings$NotificationAccessSettingsActivity"
+                  android:label="@string/manage_notification_access"
+                  android:taskAffinity=""
+                  android:excludeFromRecents="true">
+            <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"
+                       android:value="com.android.settings.NotificationAccessSettings" />
+            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
+                       android:resource="@id/security_settings" />
+        </activity>
+
+        <!-- Show regulatory info (from settings item or dialing "*#07#") -->
+        <activity android:name="RegulatoryInfoDisplayActivity"
+                  android:label="@string/regulatory_information"
+                  android:taskAffinity=""
+                  android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.settings.SHOW_REGULATORY_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <receiver android:name=".widget.SettingsAppWidgetProvider"
                 android:label="@string/gadget_title"
-                android:exported="true"
+                android:exported="false"
                 android:enabled="@bool/has_powercontrol_widget">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
diff --git a/proguard.flags b/proguard.flags
index 0805d68..8a6c2cb 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -12,6 +12,7 @@
 -keep class com.android.settings.accounts.*
 -keep class com.android.settings.fuelgauge.*
 -keep class com.android.settings.users.*
+-keep class com.android.settings.NotificationStation
 
 # Keep click responders
 -keepclassmembers class com.android.settings.inputmethod.UserDictionaryAddWordActivity {
diff --git a/res/drawable-hdpi/ic_settings_notifications.png b/res/drawable-hdpi/ic_settings_notifications.png
new file mode 100644
index 0000000..aefb57b
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_notifications.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_1.png b/res/drawable-ldrtl-hdpi/avatar_default_1.png
new file mode 100644
index 0000000..4ebe7fe
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_2.png b/res/drawable-ldrtl-hdpi/avatar_default_2.png
new file mode 100644
index 0000000..524e556
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_3.png b/res/drawable-ldrtl-hdpi/avatar_default_3.png
new file mode 100644
index 0000000..ea0d69d
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_4.png b/res/drawable-ldrtl-hdpi/avatar_default_4.png
new file mode 100644
index 0000000..7387835
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_5.png b/res/drawable-ldrtl-hdpi/avatar_default_5.png
new file mode 100644
index 0000000..0bb455c
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_6.png b/res/drawable-ldrtl-hdpi/avatar_default_6.png
new file mode 100644
index 0000000..fa42704
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_7.png b/res/drawable-ldrtl-hdpi/avatar_default_7.png
new file mode 100644
index 0000000..79c0fb7
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/avatar_default_8.png b/res/drawable-ldrtl-hdpi/avatar_default_8.png
new file mode 100644
index 0000000..a254b84
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-ldrtl-hdpi/ic_appwidget_settings_brightness_half_holo.png
new file mode 100644
index 0000000..9d8b24a
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_appwidget_settings_brightness_half_holo.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png b/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
new file mode 100644
index 0000000..2d9b75e
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_emergency.png b/res/drawable-ldrtl-hdpi/ic_emergency.png
new file mode 100644
index 0000000..89e1b07
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_emergency.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_0.png b/res/drawable-ldrtl-hdpi/ic_network_signal_0.png
new file mode 100644
index 0000000..54e7af9
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_1.png b/res/drawable-ldrtl-hdpi/ic_network_signal_1.png
new file mode 100644
index 0000000..de959d5
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_2.png b/res/drawable-ldrtl-hdpi/ic_network_signal_2.png
new file mode 100644
index 0000000..097b9fb
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_3.png b/res/drawable-ldrtl-hdpi/ic_network_signal_3.png
new file mode 100644
index 0000000..11cb40b
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_network_signal_4.png b/res/drawable-ldrtl-hdpi/ic_network_signal_4.png
new file mode 100644
index 0000000..d741ffc
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_applications.png b/res/drawable-ldrtl-hdpi/ic_settings_applications.png
new file mode 100644
index 0000000..1cb9c8d
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_display.png b/res/drawable-ldrtl-hdpi/ic_settings_display.png
new file mode 100644
index 0000000..c2f3448
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_language.png b/res/drawable-ldrtl-hdpi/ic_settings_language.png
new file mode 100755
index 0000000..bbd2c1e
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_language.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_multiuser.png b/res/drawable-ldrtl-hdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..7d6eff9
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_settings_sound.png b/res/drawable-ldrtl-hdpi/ic_settings_sound.png
new file mode 100755
index 0000000..b703b4e
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_tab_selected_running.png b/res/drawable-ldrtl-hdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..1cb9c8d
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_tab_unselected_running.png b/res/drawable-ldrtl-hdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..1cb9c8d
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png
new file mode 100644
index 0000000..5806c4f
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png
new file mode 100644
index 0000000..c3a1d91
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png
new file mode 100644
index 0000000..36ea001
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png
new file mode 100644
index 0000000..6c4f252
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-hdpi/stat_sys_phone_call.png b/res/drawable-ldrtl-hdpi/stat_sys_phone_call.png
new file mode 100755
index 0000000..033efe4
--- /dev/null
+++ b/res/drawable-ldrtl-hdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_1.png b/res/drawable-ldrtl-mdpi/avatar_default_1.png
new file mode 100644
index 0000000..2b2c00c
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_2.png b/res/drawable-ldrtl-mdpi/avatar_default_2.png
new file mode 100644
index 0000000..fa05e11
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_3.png b/res/drawable-ldrtl-mdpi/avatar_default_3.png
new file mode 100644
index 0000000..91c7d5a
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_4.png b/res/drawable-ldrtl-mdpi/avatar_default_4.png
new file mode 100644
index 0000000..4638ac2
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_5.png b/res/drawable-ldrtl-mdpi/avatar_default_5.png
new file mode 100644
index 0000000..6d84a15
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_6.png b/res/drawable-ldrtl-mdpi/avatar_default_6.png
new file mode 100644
index 0000000..c62ea5b
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_7.png b/res/drawable-ldrtl-mdpi/avatar_default_7.png
new file mode 100644
index 0000000..fe0cbfe
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/avatar_default_8.png b/res/drawable-ldrtl-mdpi/avatar_default_8.png
new file mode 100644
index 0000000..424ba3d
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-ldrtl-mdpi/ic_appwidget_settings_brightness_half_holo.png
new file mode 100644
index 0000000..90941e4
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_appwidget_settings_brightness_half_holo.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png b/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
new file mode 100644
index 0000000..b6ebe34
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_emergency.png b/res/drawable-ldrtl-mdpi/ic_emergency.png
new file mode 100755
index 0000000..004a473
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_emergency.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_0.png b/res/drawable-ldrtl-mdpi/ic_network_signal_0.png
new file mode 100644
index 0000000..4cac9ed
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_1.png b/res/drawable-ldrtl-mdpi/ic_network_signal_1.png
new file mode 100644
index 0000000..9323a13
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_2.png b/res/drawable-ldrtl-mdpi/ic_network_signal_2.png
new file mode 100644
index 0000000..e2f38a9
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_3.png b/res/drawable-ldrtl-mdpi/ic_network_signal_3.png
new file mode 100644
index 0000000..b565289
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_network_signal_4.png b/res/drawable-ldrtl-mdpi/ic_network_signal_4.png
new file mode 100644
index 0000000..f63a426
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_applications.png b/res/drawable-ldrtl-mdpi/ic_settings_applications.png
new file mode 100644
index 0000000..740e709
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_display.png b/res/drawable-ldrtl-mdpi/ic_settings_display.png
new file mode 100644
index 0000000..b25e0a7
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_language.png b/res/drawable-ldrtl-mdpi/ic_settings_language.png
new file mode 100644
index 0000000..bb97a45
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_language.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_multiuser.png b/res/drawable-ldrtl-mdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..f538805
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_settings_sound.png b/res/drawable-ldrtl-mdpi/ic_settings_sound.png
new file mode 100644
index 0000000..419868f
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_tab_selected_running.png b/res/drawable-ldrtl-mdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..740e709
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_tab_unselected_running.png b/res/drawable-ldrtl-mdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..740e709
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png
new file mode 100644
index 0000000..3f635f8
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png
new file mode 100644
index 0000000..04aae2d
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png
new file mode 100644
index 0000000..17609df
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png
new file mode 100644
index 0000000..90a8e27
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-mdpi/stat_sys_phone_call.png b/res/drawable-ldrtl-mdpi/stat_sys_phone_call.png
new file mode 100644
index 0000000..f566dad
--- /dev/null
+++ b/res/drawable-ldrtl-mdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_1.png b/res/drawable-ldrtl-xhdpi/avatar_default_1.png
new file mode 100644
index 0000000..1fdbd46
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_2.png b/res/drawable-ldrtl-xhdpi/avatar_default_2.png
new file mode 100644
index 0000000..9d3d693
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_3.png b/res/drawable-ldrtl-xhdpi/avatar_default_3.png
new file mode 100644
index 0000000..3778914
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_4.png b/res/drawable-ldrtl-xhdpi/avatar_default_4.png
new file mode 100644
index 0000000..a25b4f8
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_5.png b/res/drawable-ldrtl-xhdpi/avatar_default_5.png
new file mode 100644
index 0000000..2840f22
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_5.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_6.png b/res/drawable-ldrtl-xhdpi/avatar_default_6.png
new file mode 100644
index 0000000..d438170
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_6.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_7.png b/res/drawable-ldrtl-xhdpi/avatar_default_7.png
new file mode 100644
index 0000000..b155d9e
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_7.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/avatar_default_8.png b/res/drawable-ldrtl-xhdpi/avatar_default_8.png
new file mode 100644
index 0000000..a17e3a4
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/avatar_default_8.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_appwidget_settings_brightness_half_holo.png b/res/drawable-ldrtl-xhdpi/ic_appwidget_settings_brightness_half_holo.png
new file mode 100644
index 0000000..b06324e
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_appwidget_settings_brightness_half_holo.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png b/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
new file mode 100644
index 0000000..8b67b91
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_bt_cellphone.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_emergency.png b/res/drawable-ldrtl-xhdpi/ic_emergency.png
new file mode 100644
index 0000000..ddc2642
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_emergency.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png
new file mode 100644
index 0000000..e4ec015
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_network_signal_0.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png
new file mode 100644
index 0000000..712685a
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_network_signal_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png
new file mode 100644
index 0000000..99fe1ac
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_network_signal_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png
new file mode 100644
index 0000000..4ac2f10
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_network_signal_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png
new file mode 100644
index 0000000..34608f1
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_network_signal_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_applications.png b/res/drawable-ldrtl-xhdpi/ic_settings_applications.png
new file mode 100644
index 0000000..fcd6ab1
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_applications.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_display.png b/res/drawable-ldrtl-xhdpi/ic_settings_display.png
new file mode 100644
index 0000000..4184864
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_display.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_language.png b/res/drawable-ldrtl-xhdpi/ic_settings_language.png
new file mode 100644
index 0000000..3e0f3df
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_language.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_multiuser.png b/res/drawable-ldrtl-xhdpi/ic_settings_multiuser.png
new file mode 100644
index 0000000..a3c797c
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_multiuser.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_settings_sound.png b/res/drawable-ldrtl-xhdpi/ic_settings_sound.png
new file mode 100644
index 0000000..8d04d42
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_settings_sound.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_tab_selected_running.png b/res/drawable-ldrtl-xhdpi/ic_tab_selected_running.png
new file mode 100644
index 0000000..fcd6ab1
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_tab_selected_running.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_tab_unselected_running.png b/res/drawable-ldrtl-xhdpi/ic_tab_unselected_running.png
new file mode 100644
index 0000000..fcd6ab1
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_tab_unselected_running.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png
new file mode 100644
index 0000000..0e124bd
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_1.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png
new file mode 100644
index 0000000..d97d5d4
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_2.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png
new file mode 100644
index 0000000..99a8384
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_3.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png
new file mode 100644
index 0000000..40307f8
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/ic_wifi_lock_signal_4.png
Binary files differ
diff --git a/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.png b/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.png
new file mode 100644
index 0000000..dce5d9a
--- /dev/null
+++ b/res/drawable-ldrtl-xhdpi/stat_sys_phone_call.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_notifications.png b/res/drawable-mdpi/ic_settings_notifications.png
new file mode 100644
index 0000000..fa7a07c
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_notifications.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_notifications.png b/res/drawable-xhdpi/ic_settings_notifications.png
new file mode 100644
index 0000000..c6c5c43
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_notifications.png
Binary files differ
diff --git a/res/layout/app_ops_details.xml b/res/layout/app_ops_details.xml
new file mode 100644
index 0000000..d28689d
--- /dev/null
+++ b/res/layout/app_ops_details.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:clipToPadding="false"
+    android:scrollbarStyle="@*android:integer/preference_fragment_scrollbarStyle">
+
+    <LinearLayout
+        android:id="@+id/all_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingBottom="5dip"
+        android:orientation="vertical">
+
+        <!-- App snippet -->
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+            android:orientation="vertical">
+
+            <!-- Application snippet label, version and icon -->
+            <include
+                layout="@layout/manage_applications_item"
+                android:id="@+id/app_snippet" />
+
+        </LinearLayout>
+
+        <!-- Operations list -->
+        <LinearLayout
+            android:id="@+id/operations_section"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
diff --git a/res/layout/app_ops_details_item.xml b/res/layout/app_ops_details_item.xml
new file mode 100644
index 0000000..c630ad6
--- /dev/null
+++ b/res/layout/app_ops_details_item.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="3">
+
+    <ImageView
+        android:id="@+id/op_icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_column="0"
+        android:layout_row="0"
+        android:layout_rowSpan="2"
+        android:layout_marginEnd="8dip"
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
+
+    <TextView
+        android:id="@+id/op_name"
+        android:layout_column="1"
+        android:layout_row="0"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginTop="2dip"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
+
+    <TextView
+        android:id="@+id/op_time"
+        android:layout_column="1"
+        android:layout_row="1"
+        android:layout_gravity="fill_horizontal|top"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAlignment="viewStart" />
+
+    <Switch android:id="@+id/switchWidget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="8dip"
+        android:layout_column="2"
+        android:layout_row="0"
+        android:layout_rowSpan="2"
+        android:padding="8dip"
+        android:focusable="false"
+        android:clickable="true" />
+
+</GridLayout>
diff --git a/res/layout/app_ops_item.xml b/res/layout/app_ops_item.xml
new file mode 100644
index 0000000..8d21456
--- /dev/null
+++ b/res/layout/app_ops_item.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2008, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip"
+    android:columnCount="3">
+
+    <ImageView
+        android:id="@+id/app_icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_rowSpan="2"
+        android:layout_marginEnd="8dip"
+        android:scaleType="centerInside"
+        android:contentDescription="@null" />
+
+    <TextView
+        android:id="@+id/app_name"
+        android:layout_width="0dip"
+        android:layout_columnSpan="2"
+        android:layout_gravity="fill_horizontal"
+        android:layout_marginTop="2dip"
+        android:singleLine="true"
+        android:ellipsize="marquee"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
+
+    <TextView
+        android:id="@+id/op_name"
+        android:layout_width="0dip"
+        android:layout_gravity="fill_horizontal|top"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAlignment="viewStart" />
+
+    <TextView
+        android:id="@+id/op_time"
+        android:layout_marginStart="8dip"
+        android:layout_gravity="top"
+        android:textAppearance="?android:attr/textAppearanceSmall" />
+
+</GridLayout>
diff --git a/res/layout/app_ops_summary.xml b/res/layout/app_ops_summary.xml
new file mode 100644
index 0000000..2073a00
--- /dev/null
+++ b/res/layout/app_ops_summary.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+        <android.support.v4.view.PagerTabStrip
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="top"
+                android:textAppearance="@style/TextAppearance.PagerTabs"
+                android:paddingLeft="@dimen/pager_tabs_padding"
+                android:paddingRight="@dimen/pager_tabs_padding">
+        </android.support.v4.view.PagerTabStrip>
+    </android.support.v4.view.ViewPager>
+
+</LinearLayout>
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 8bdbadb..03226ca 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -46,13 +46,14 @@
     <TextView
         android:id="@android:id/text1"
         android:layout_marginStart="8dip"
+        android:layout_marginTop="2dip"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <ProgressBar
         android:id="@android:id/progress"
         android:layout_height="12dip"
         android:layout_columnSpan="2"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:layout_marginTop="4dip"
         android:max="100"
         android:progressDrawable="@drawable/data_usage_bar"
@@ -61,7 +62,7 @@
     <TextView
         android:id="@android:id/summary"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:layout_columnSpan="2"
         android:layout_marginTop="4dip"
         android:visibility="gone"
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
index acc3a65..e8dd824 100644
--- a/res/layout/dream_info_row.xml
+++ b/res/layout/dream_info_row.xml
@@ -24,6 +24,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toStartOf="@+id/divider"
+        android:clickable="true"
+        android:focusable="true"
         android:background="?android:attr/selectableItemBackground" >
 
         <!-- Dream icon -->
@@ -95,6 +97,8 @@
         android:background="?android:attr/selectableItemBackground"
         android:contentDescription="@string/screensaver_settings_button"
         android:padding="8dip"
+        android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_bt_config" />
 
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
new file mode 100644
index 0000000..d23f6f5
--- /dev/null
+++ b/res/layout/edit_user_info_dialog_content.xml
@@ -0,0 +1,49 @@
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:baselineAligned="false"
+    android:padding="16dip">
+
+    <ImageView
+        android:id="@+id/user_photo"
+        android:layout_width="56dip"
+        android:layout_height="56dip"
+        android:layout_gravity="bottom"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@null"
+        android:background="@*android:drawable/spinner_background_holo_dark"
+        android:scaleType="fitCenter"/>
+
+    <EditText
+        android:id="@+id/user_name"
+        android:layout_width="0dip"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_weight="1"
+        android:layout_marginStart="6dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart"
+        android:labelFor="@id/user_photo"
+        android:inputType="text|textCapWords"
+        android:selectAllOnFocus="true"
+        android:hint="@string/user_nickname"/>
+
+</LinearLayout>
diff --git a/res/layout/edit_user_photo_popup_item.xml b/res/layout/edit_user_photo_popup_item.xml
new file mode 100644
index 0000000..11fdfbc
--- /dev/null
+++ b/res/layout/edit_user_photo_popup_item.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"
+    android:textColor="?android:attr/textColorAlertDialogListItem"
+    android:gravity="center_vertical"
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip"
+    android:ellipsize="marquee"
+/>
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
new file mode 100644
index 0000000..fbeeb27
--- /dev/null
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:scrollbarStyle="outsideOverlay"
+    android:gravity="top">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip" >
+
+        <TextView android:id="@+id/capabilities_header"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:padding="10dip"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <LinearLayout android:id="@+id/capabilities"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="10dip" />
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index f471f55..bf93840 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -58,13 +58,14 @@
     <TextView
         android:id="@+id/app_size"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textAlignment="viewStart" />
 
     <TextView
         android:id="@+id/app_disabled"
         android:layout_marginStart="8dip"
+        android:layout_gravity="top"
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </GridLayout>
diff --git a/res/layout/notification_access_settings.xml b/res/layout/notification_access_settings.xml
new file mode 100644
index 0000000..db1f708
--- /dev/null
+++ b/res/layout/notification_access_settings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1">
+        <ListView android:id="@android:id/list"
+                android:layout_width="match_parent" 
+                android:layout_height="match_parent"
+                android:drawSelectorOnTop="false"
+                android:fastScrollEnabled="true" />
+        <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="@string/no_notification_listeners"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+    </FrameLayout>
+</LinearLayout>
diff --git a/res/layout/notification_info_row.xml b/res/layout/notification_info_row.xml
new file mode 100644
index 0000000..bc71ef2
--- /dev/null
+++ b/res/layout/notification_info_row.xml
@@ -0,0 +1,115 @@
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content" >
+
+    <!-- Dream selectable row (icon, caption, radio button) -->
+
+    <RelativeLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_toStartOf="@+id/divider"
+        android:background="?android:attr/selectableItemBackground" >
+
+        <!-- Dream icon -->
+
+        <ImageView
+            android:id="@+id/pkgicon"
+            android:layout_width="@*android:dimen/status_bar_icon_size"
+            android:layout_height="@*android:dimen/status_bar_icon_size"
+            android:layout_centerVertical="true"
+            android:layout_marginBottom="6dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="6dp"
+            android:layout_marginTop="6dp"
+            android:contentDescription="@null"
+            android:maxHeight="@*android:dimen/status_bar_icon_size"
+            android:maxWidth="@*android:dimen/status_bar_icon_size"
+            android:scaleType="fitCenter" />
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@*android:dimen/status_bar_icon_size"
+            android:layout_height="@*android:dimen/status_bar_icon_size"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/pkgicon"
+            android:layout_marginBottom="6dp"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginTop="6dp"
+            android:contentDescription="@null"
+            android:maxHeight="@*android:dimen/status_bar_icon_size"
+            android:maxWidth="@*android:dimen/status_bar_icon_size"
+            android:scaleType="fitCenter" />
+
+        <!-- Dream caption -->
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@android:id/button1"
+            android:layout_toEndOf="@android:id/icon"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAlignment="viewStart"
+            android:labelFor="@android:id/button2" />
+
+        <!-- Dream radio button -->
+
+        <!--<RadioButton
+            android:id="@android:id/button1"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"
+            android:duplicateParentState="true"
+            android:clickable="false"
+            android:focusable="false" />-->
+    </RelativeLayout>
+
+    <!-- Divider -->
+
+    <ImageView
+        android:id="@id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@android:id/button2"
+        android:contentDescription="@null"
+        android:src="@drawable/nav_divider" />
+
+    <!-- Settings icon -->
+
+    <ImageView
+        android:id="@android:id/button2"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignBottom="@android:id/widget_frame"
+        android:layout_alignParentEnd="true"
+        android:layout_alignTop="@android:id/widget_frame"
+        android:layout_centerVertical="true"
+        android:layout_margin="0dip"
+        android:background="?android:attr/selectableItemBackground"
+        android:contentDescription="@string/screensaver_settings_button"
+        android:padding="8dip"
+        android:src="@drawable/ic_bt_config" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/notification_listener_item.xml b/res/layout/notification_listener_item.xml
new file mode 100644
index 0000000..67aaa61
--- /dev/null
+++ b/res/layout/notification_listener_item.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingEnd="6dip"
+    android:gravity="center_vertical"
+    >
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_gravity="center_vertical"
+        android:scaleType="centerInside"
+        android:contentDescription="@null"
+        />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dip"
+        android:layout_marginBottom="8dip"
+        android:orientation="vertical"
+        android:gravity="left|center_vertical"
+        android:layout_weight="1">
+
+        <TextView android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal" />
+
+        <TextView android:id="@+id/description"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dip"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:maxLines="4" />
+
+    </LinearLayout>
+
+    <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dip"
+        android:layout_marginStart="16dip"
+        android:focusable="false"
+        android:clickable="false" />
+
+</LinearLayout>
diff --git a/res/layout/notification_log_row.xml b/res/layout/notification_log_row.xml
new file mode 100644
index 0000000..284e9ea
--- /dev/null
+++ b/res/layout/notification_log_row.xml
@@ -0,0 +1,117 @@
+<!--
+     Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="6dp"
+    android:paddingTop="6dp"
+    android:orientation="vertical"
+    android:background="?android:attr/selectableItemBackground"
+    >
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@*android:dimen/status_bar_icon_size"
+        android:layout_marginBottom="4dp"
+        >
+
+        <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="@*android:dimen/status_bar_icon_size"
+            android:layout_height="@*android:dimen/status_bar_icon_size"
+            android:layout_centerVertical="true"
+            android:layout_toEndOf="@id/pkgicon"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="8dp"
+            android:contentDescription="@null"
+            android:adjustViewBounds="true"
+            android:maxHeight="@*android:dimen/status_bar_icon_size"
+            android:maxWidth="@*android:dimen/status_bar_icon_size"
+            android:scaleType="fitCenter" />
+
+        <TextView
+            android:id="@android:id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@+id/timestamp"
+            android:layout_toEndOf="@android:id/icon"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textStyle="bold"
+            android:textAlignment="viewStart"
+            android:labelFor="@android:id/button2" />
+
+        <DateTimeView
+            android:id="@+id/timestamp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@android:id/widget_frame"
+            android:layout_alignParentEnd="true"
+            android:layout_alignTop="@android:id/widget_frame"
+            android:layout_centerVertical="true"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAlignment="viewEnd"
+            />
+    </RelativeLayout>
+
+    <TextView
+        android:id="@+id/extra"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginStart="30dp"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textAlignment="viewStart"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="@*android:dimen/status_bar_icon_size"
+        android:orientation="horizontal"
+        android:layout_marginStart="30dp"
+        >
+
+        <ImageView
+            android:id="@+id/pkgicon"
+            android:layout_width="@*android:dimen/status_bar_icon_size"
+            android:layout_height="@*android:dimen/status_bar_icon_size"
+            android:layout_marginStart="0dp"
+            android:layout_marginEnd="6dp"
+            android:contentDescription="@null"
+            android:adjustViewBounds="true"
+            android:maxHeight="@*android:dimen/status_bar_icon_size"
+            android:maxWidth="@*android:dimen/status_bar_icon_size"
+            android:scaleType="fitCenter" />
+
+        <TextView
+            android:id="@+id/pkgname"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="left|center_vertical"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAlignment="viewStart"
+            />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index d33f156..35f04d8 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -37,10 +37,20 @@
                 android:background="#ff404040"
                 />
 
+            <EditText android:id="@+id/owner_info_nickname"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                android:gravity="top"
+                android:hint="@string/user_nickname"
+                android:inputType="textCapWords"
+            />
+
             <CheckBox android:id="@+id/show_owner_info_on_lockscreen_checkbox"
                 android:layout_width="match_parent"
                 android:layout_height="64dip"
                 android:gravity="center_vertical"
+                android:layout_marginTop="8dip"
                 android:text="@string/show_owner_info_on_lockscreen_label"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textColor="?android:attr/textColorSecondary"
diff --git a/res/layout/preference_app_restrictions.xml b/res/layout/preference_app_restrictions.xml
new file mode 100644
index 0000000..a8a93d1
--- /dev/null
+++ b/res/layout/preference_app_restrictions.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:paddingStart="@*android:dimen/preference_item_padding_side"
+    android:paddingEnd="?android:attr/scrollbarSize">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:id="@+id/app_restrictions_pref"
+        android:focusable="true"
+        android:clickable="true"
+        android:gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackground" >
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:minWidth="@*android:dimen/preference_icon_minWidth"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+android:id/icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:minWidth="48dp"
+                android:scaleType="centerInside"
+                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
+                 />
+        </LinearLayout>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+            <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"/>
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                android:paddingBottom="3dip"
+                android:visibility="gone"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="13sp"
+                android:textColor="?android:attr/textColorSecondary"
+                android:focusable="false"
+                android:maxLines="4" />
+        </RelativeLayout>
+    </LinearLayout>
+    <ImageView
+        android:id="@+id/app_restrictions_settings"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="12dip"
+        android:paddingEnd="12dp"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:contentDescription="@string/apps_with_restrictions_settings_button"
+        android:layout_gravity="center"
+        android:clickable="true"
+        android:focusable="true"
+        android:background="?android:attr/selectableItemBackground" />
+    <View
+        android:id="@+id/settings_divider"
+        android:layout_width="1dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingRight="?android:attr/scrollbarSize"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+</LinearLayout>
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
deleted file mode 100644
index b3d62cb..0000000
--- a/res/layout/preference_dialog_brightness.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
-
-     Copyright (C) 2009 Motorola, Inc.
-     March 23, 2009 - Motorola - Allow automatic brightness changes.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dip">
-
-        <ImageView android:id="@android:id/icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingTop="20dip"
-                android:visibility="gone"
-                android:contentDescription="@null" />
-
-        <CheckBox android:id="@+id/automatic_mode"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/automatic_brightness"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:layout_marginTop="6dip"
-                android:layout_marginStart="20dip"
-                android:layout_marginEnd="20dip" />
-
-        <SeekBar android:id="@*android:id/seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="20dip" />
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
deleted file mode 100644
index 5efc028..0000000
--- a/res/layout/preference_powergauge.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingStart="16dip"
-    android:paddingEnd="?android:attr/scrollbarSize">
-
-    <ImageView
-        android:id="@+id/appIcon"
-        android:layout_width="48dip"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="6dip"
-        android:layout_gravity="center"
-        android:contentDescription="@null" />
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dip"
-        android:layout_marginTop="2dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView android:id="@+android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_marginTop="2dip"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_toStartOf="@+id/percent"
-            android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <TextView android:id="@+id/percent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignBottom="@android:id/title"
-            android:layout_gravity="bottom"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"/>
-
-        <ImageView
-            android:id="@+id/appGauge"
-            android:background="#80404040"
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dip"
-            android:layout_below="@id/percent"
-            android:layout_gravity="center_vertical"
-            android:contentDescription="@null" />
-
-        <TextView android:id="@+android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignStart="@id/appGauge"
-            android:layout_below="@id/appGauge"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:maxLines="2" />
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/res/layout/preference_rename_widget.xml b/res/layout/preference_rename_widget.xml
new file mode 100644
index 0000000..81e401f
--- /dev/null
+++ b/res/layout/preference_rename_widget.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout for a text label in the user limits screen. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/user_rename" />
diff --git a/res/layout/preference_user_delete_widget.xml b/res/layout/preference_user_delete_widget.xml
index 68355ba..7d563f8 100644
--- a/res/layout/preference_user_delete_widget.xml
+++ b/res/layout/preference_user_delete_widget.xml
@@ -21,6 +21,24 @@
         android:layout_height="match_parent"
         android:orientation="horizontal">
     <View
+        android:id="@+id/divider_manage"
+        android:layout_width="2dip"
+        android:layout_height="match_parent"
+        android:layout_marginTop="5dip"
+        android:layout_marginBottom="5dip"
+        android:background="@android:drawable/divider_horizontal_dark" />
+    <ImageView
+        android:id="@+id/manage_user"
+        android:layout_width="wrap_content"
+        android:layout_height="fill_parent"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
+        android:src="@drawable/ic_sysbar_quicksettings"
+        android:contentDescription="@string/settings_label"
+        android:layout_gravity="center"
+        android:background="?android:attr/selectableItemBackground" />
+    <View
+        android:id="@+id/divider_delete"
         android:layout_width="2dip"
         android:layout_height="match_parent"
         android:layout_marginTop="5dip"
@@ -30,8 +48,8 @@
         android:id="@+id/trash_user"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:paddingStart="15dip"
-        android:paddingEnd="?android:attr/scrollbarSize"
+        android:paddingStart="16dip"
+        android:paddingEnd="16dip"
         android:src="@drawable/ic_menu_delete_holo_dark"
         android:contentDescription="@string/user_delete_user_description"
         android:layout_gravity="center"
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 8888a98..eeb46a0 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -203,6 +203,14 @@
                 android:layout_height="wrap_content"
                 />
 
+        <!-- CellInfoListRate -->
+        <Button android:id="@+id/cell_info_list_rate"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
         <!-- IMS registration required -->
         <Button android:id="@+id/ims_reg_required"
                 android:textSize="14sp"
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml
index 5827557..478eaab 100755
--- a/res/layout/regulatory_info.xml
+++ b/res/layout/regulatory_info.xml
@@ -14,8 +14,8 @@
      limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
     <ImageView
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index e64b594..52cecf6 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -62,7 +62,7 @@
 
     <LinearLayout
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal">
+        android:layout_gravity="fill_horizontal|top">
 
         <TextView
             android:id="@+id/description"
diff --git a/res/layout/text_description_preference.xml b/res/layout/text_description_preference.xml
index 7d73f58..78eb02a 100644
--- a/res/layout/text_description_preference.xml
+++ b/res/layout/text_description_preference.xml
@@ -14,18 +14,11 @@
      limitations under the License.
 -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/message_container"
-    android:layout_width="match_parent"
+<TextView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/summary"
+    android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <TextView
-        android:id="@+id/summary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="?android:attr/textColorSecondary"
-        android:padding="16dip" />
-
-</LinearLayout>
+    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textColor="?android:attr/textColorSecondary"
+    android:padding="16dip" />
diff --git a/res/layout/title.xml b/res/layout/title.xml
index 0c2084b..46b2115 100644
--- a/res/layout/title.xml
+++ b/res/layout/title.xml
@@ -54,7 +54,7 @@
     <TextView
         android:id="@+id/provider_id"
         android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal"
+        android:layout_gravity="fill_horizontal|top"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:textAppearance="?android:attr/textAppearanceSmall"
diff --git a/res/layout/two_line_list_item.xml b/res/layout/two_line_list_item.xml
new file mode 100644
index 0000000..e6a7c2b
--- /dev/null
+++ b/res/layout/two_line_list_item.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:paddingStart="16dip"
+    android:paddingEnd="16dip"
+    android:paddingTop="8dip"
+    android:paddingBottom="8dip">
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:ellipsize="marquee"
+        android:fadingEdge="horizontal"/>
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/title"
+        android:layout_alignStart="@id/title"
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:textColor="?android:attr/textColorSecondary"
+        android:maxLines="4" />
+</RelativeLayout>
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index d8b8694..3624dad 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -45,6 +45,7 @@
             android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
             android:layout_marginTop="8dip"
+            android:hint="@string/user_dict_settings_add_word_hint"
             android:inputType="textNoSuggestions"
             android:imeOptions="flagNoFullscreen">
     <requestFocus />
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index f29c669..b72886f 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -33,6 +33,7 @@
             android:layout_marginStart="8dip"
             android:layout_marginBottom="8dip"
             android:layout_marginTop="8dip"
+            android:hint="@string/user_dict_settings_add_word_hint"
             android:inputType="textNoSuggestions"
             android:imeOptions="flagNoFullscreen">
     <requestFocus />
@@ -56,6 +57,7 @@
               android:layout_marginStart="8dip"
               android:layout_marginBottom="8dip"
               android:layout_marginTop="8dip"
+              android:hint="@string/user_dict_settings_add_shortcut_hint"
               android:inputType="textNoSuggestions"
               android:imeOptions="flagNoFullscreen" />
     <TextView android:id="@+id/user_dictionary_add_locale_label"
diff --git a/res/layout/user_info_header.xml b/res/layout/user_info_header.xml
new file mode 100644
index 0000000..c698eaf
--- /dev/null
+++ b/res/layout/user_info_header.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    android:focusable="true"
+    android:clickable="true"
+    android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+    android:paddingEnd="@*android:dimen/preference_fragment_padding_side" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        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:background="?android:attr/selectableItemBackground" >
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:minWidth="@*android:dimen/preference_icon_minWidth"
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+android:id/icon"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center"
+                android:minWidth="48dp"
+                android:scaleType="centerInside"
+                android:layout_marginEnd="@*android:dimen/preference_item_padding_inner"
+                 />
+        </LinearLayout>
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="6dip"
+            android:layout_marginTop="6dip"
+            android:layout_marginBottom="6dip"
+            android:layout_weight="1">
+            <TextView
+                android:id="@+android:id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"/>
+            <TextView
+                android:id="@android:id/summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@android:id/title"
+                android:layout_alignStart="@android:id/title"
+                android:paddingBottom="3dip"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="13sp"
+                android:textColor="?android:attr/textColorSecondary"
+                android:focusable="false"
+                android:text="@string/user_summary_restricted_profile"
+                android:maxLines="4" />
+        </RelativeLayout>
+        <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:paddingStart="16dip"
+                android:paddingEnd="16dip"
+                android:src="@drawable/ic_sysbar_quicksettings"
+                android:contentDescription="@string/settings_label"
+                android:layout_gravity="center"/>
+    </LinearLayout>
+    <View android:layout_width="match_parent"
+          android:layout_height="2dp"
+          android:background="@color/divider_color" />
+</LinearLayout>
diff --git a/res/layout/user_limits.xml b/res/layout/user_limits.xml
new file mode 100644
index 0000000..b242f0e
--- /dev/null
+++ b/res/layout/user_limits.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:layout_marginStart="32dp"
+    android:layout_marginEnd="32dp"
+    android:orientation="vertical">
+
+    <fragment android:name="com.android.settings.users.AppRestrictionsFragment"
+            android:id="@+id/user_limits_fragment"
+            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            />
+    <RelativeLayout
+            android:id="@+id/button_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0" >
+       <Button
+                android:id="@+id/back_button"
+                android:layout_width="150dip"
+                android:layout_height="wrap_content"
+                android:layout_alignParentStart="true"
+                android:layout_margin="5dip"
+                android:text="@string/wizard_back"
+                android:visibility="invisible"/>
+
+       <Button
+               android:id="@+id/next_button"
+               android:layout_width="150dip"
+               android:layout_height="wrap_content"
+               android:layout_margin="5dip"
+               android:layout_alignParentEnd="true"
+               android:text="@string/wizard_finish" />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml
index d458cd3..a2146c6 100644
--- a/res/layout/wifi_ap_dialog.xml
+++ b/res/layout/wifi_ap_dialog.xml
@@ -46,6 +46,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:singleLine="true"
+                    android:hint="@string/wifi_ssid_hint"
                     android:inputType="textNoSuggestions"
                     android:maxLength="32" />
 
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index fef10b3..143d9ee 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -86,6 +86,7 @@
                     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" />
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 4824be6..cd968b1 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -21,7 +21,8 @@
     <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:paddingBottom="8dip">
 
         <LinearLayout android:id="@+id/info"
                 style="@style/wifi_section" />
@@ -38,7 +39,8 @@
                         android:textDirection="locale" />
 
                 <EditText android:id="@+id/ssid"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_edit_content"
+                        android:hint="@string/wifi_ssid_hint"
                         android:maxLength="32"
                         android:singleLine="true"
                         android:inputType="textNoSuggestions" />
@@ -123,7 +125,7 @@
                             android:text="@string/wifi_eap_identity" />
 
                     <EditText android:id="@+id/identity"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:inputType="textNoSuggestions" />
                 </LinearLayout>
@@ -136,7 +138,7 @@
                             android:text="@string/wifi_eap_anonymous" />
 
                     <EditText android:id="@+id/anonymous"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:inputType="textNoSuggestions" />
                 </LinearLayout>
@@ -149,7 +151,7 @@
                         android:text="@string/wifi_password" />
 
                 <EditText android:id="@+id/password"
-                        style="@style/wifi_item_content"
+                        style="@style/wifi_item_edit_content"
                         android:singleLine="true"
                         android:password="true" />
             </LinearLayout>
@@ -218,7 +220,7 @@
                             android:text="@string/proxy_hostname_label" />
 
                     <EditText android:id="@+id/proxy_hostname"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_hostname_hint"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true" />
@@ -229,7 +231,7 @@
                             android:text="@string/proxy_port_label" />
 
                     <EditText android:id="@+id/proxy_port"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_port_hint"
                             android:inputType="number"
                             android:singleLine="true" />
@@ -240,7 +242,7 @@
                             android:text="@string/proxy_exclusionlist_label" />
 
                     <EditText android:id="@+id/proxy_exclusionlist"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:hint="@string/proxy_exclusionlist_hint"
                             android:inputType="textNoSuggestions"
                             android:singleLine="true" />
@@ -272,7 +274,7 @@
                             android:text="@string/wifi_ip_address" />
 
                     <EditText android:id="@+id/ipaddress"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_ip_address_hint"
                             android:inputType="textNoSuggestions" />
@@ -285,7 +287,7 @@
                             android:text="@string/wifi_gateway" />
 
                     <EditText android:id="@+id/gateway"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_gateway_hint"
                             android:inputType="textNoSuggestions" />
@@ -298,7 +300,7 @@
                             android:text="@string/wifi_network_prefix_length" />
 
                     <EditText android:id="@+id/network_prefix_length"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_network_prefix_length_hint"
                             android:inputType="number" />
@@ -310,7 +312,7 @@
                             android:text="@string/wifi_dns1" />
 
                     <EditText android:id="@+id/dns1"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns1_hint"
                             android:inputType="textNoSuggestions" />
@@ -323,7 +325,7 @@
                             android:text="@string/wifi_dns2" />
 
                     <EditText android:id="@+id/dns2"
-                            style="@style/wifi_item_content"
+                            style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns2_hint"
                             android:inputType="textNoSuggestions" />
diff --git a/res/layout/wifi_dialog_row.xml b/res/layout/wifi_dialog_row.xml
index 7ca2e5c..6cac559 100644
--- a/res/layout/wifi_dialog_row.xml
+++ b/res/layout/wifi_dialog_row.xml
@@ -18,10 +18,12 @@
         style="@style/wifi_item" >
     <TextView
             style="@style/wifi_item_label"
-            android:id="@+id/name" />
+            android:id="@+id/name"
+            android:textAlignment="viewStart" />
 
     <TextView
             android:id="@+id/value"
             style="@style/wifi_item_content"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:textAlignment="viewStart" />
 </LinearLayout>
diff --git a/res/layout/wifi_notify_scan_mode.xml b/res/layout/wifi_notify_scan_mode.xml
new file mode 100644
index 0000000..e9696d7
--- /dev/null
+++ b/res/layout/wifi_notify_scan_mode.xml
@@ -0,0 +1,12 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+
+    <CheckBox
+        android:id="@+id/checkbox"
+        style="?android:attr/textAppearanceMedium"
+        android:text="@string/wifi_scan_notify_remember_choice"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp" />
+</FrameLayout>
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index e46ce09..d688c58 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Stadig"</item>
     <item msgid="1145554631248513562">"Normaal"</item>
     <item msgid="7553665153391107454">"Vinnig"</item>
-    <item msgid="2538100882620724753">"Baie vinnig"</item>
+    <item msgid="1370673569131070146">"Vinniger"</item>
+    <item msgid="4648206845228970803">"Baie vinnig"</item>
+    <item msgid="4977949754169483251">"Vinnig"</item>
+    <item msgid="6106302964845503577">"Baie vinnig"</item>
+    <item msgid="6800277205640837264">"Vinnigste"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Baie laag"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Geen"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Ongespesifiseer"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Geen"</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">"Interne toestelberging"</item>
     <item msgid="3738430123799803530">"Verwyderbare SD-kaart"</item>
     <item msgid="4498124044785815005">"Laat die stelsel besluit"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Ligging"</item>
+    <item msgid="255608127647030286">"Persoonlik"</item>
+    <item msgid="4588829735729884491">"Boodskappe"</item>
+    <item msgid="8971765125227378270">"Toestel"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"growwe ligging"</item>
+    <item msgid="5789673140227507995">"fyn ligging"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibreer"</item>
+    <item msgid="3434165993711230924">"lees kontakte"</item>
+    <item msgid="616161687718081936">"verander kontakte"</item>
+    <item msgid="7638002295329050091">"lees oproeprekord"</item>
+    <item msgid="6546959730920410907">"verander oproeprekord"</item>
+    <item msgid="446877710771379667">"lees kalender"</item>
+    <item msgid="7674458294386319722">"verander kalender"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-skandering"</item>
+    <item msgid="8694611243479480497">"kennisgewing"</item>
+    <item msgid="7776439107987345446">"sel-skandering"</item>
+    <item msgid="514615766544675057">"bel foon"</item>
+    <item msgid="8181415497109310680">"lees SMS"</item>
+    <item msgid="6816551144382117307">"skryf SMS"</item>
+    <item msgid="4600463921908905030">"ontvang SMS"</item>
+    <item msgid="5958926493289432745">"ontvang nood-SMS"</item>
+    <item msgid="4945269495221089540">"ontvang MMS"</item>
+    <item msgid="5570472453573929087">"ontvang WAP-stootpos"</item>
+    <item msgid="7125408150230860501">"stuur SMS"</item>
+    <item msgid="7080337936612188061">"lees ICC-SMS"</item>
+    <item msgid="587124103118495063">"skryf ICC-SMS"</item>
+    <item msgid="2320577158869025503">"verander instellings"</item>
+    <item msgid="1545733463471924009">"teken bo-op"</item>
+    <item msgid="3609046903962454582">"kry toegang tot kennisgewings"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"neem oudio op"</item>
+    <item msgid="5031552983987798163">"speel oudio"</item>
+    <item msgid="8374996688066472414">"lees knipbord"</item>
+    <item msgid="3045529469061083747">"verander knipbord"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ligging"</item>
+    <item msgid="8677040780775113033">"Ligging"</item>
+    <item msgid="1660743989948992916">"Ligging"</item>
+    <item msgid="8791172739860195290">"Vibreer"</item>
+    <item msgid="383413555642128046">"Lees kontakte"</item>
+    <item msgid="3654594895269697313">"Verander kontakte"</item>
+    <item msgid="7928393476362362538">"Lees oproeprekord"</item>
+    <item msgid="6248591205254641116">"Verander oproeprekord"</item>
+    <item msgid="6093344633066170692">"Lees kalender"</item>
+    <item msgid="1334886368750347692">"Verander kalender"</item>
+    <item msgid="1638204101698708656">"Ligging"</item>
+    <item msgid="2154671955760380322">"Plaas kennisgewing"</item>
+    <item msgid="4282477730595931828">"Ligging"</item>
+    <item msgid="4891423912898525905">"Bel foon"</item>
+    <item msgid="626463821668200388">"Ontvang SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Stuur SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Ontvang SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Ontvang SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Ontvang SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Ontvang SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Stuur SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Ontvang SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Stuur SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Verander instellings"</item>
+    <item msgid="736541391767350377">"Teken bo-op"</item>
+    <item msgid="5530815681721654194">"Kry toegang tot kennisgewings"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Neem oudio op"</item>
+    <item msgid="3493046322001257041">"Speel oudio"</item>
+    <item msgid="136815868796597058">"Lees knipbord"</item>
+    <item msgid="5238692940326972503">"Verander knipbord"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Medium"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Grafika)"</item>
     <item msgid="1340692776955662664">"Belstapel op glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Af"</item>
+    <item msgid="675719912558941285">"Teken nie-reghoekige knipstreek in blou"</item>
+    <item msgid="1064373276095698656">"Merk getoetsde tekenopdragte in groen"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Af"</item>
+    <item msgid="2751513398307949636">"Op skerm as balke"</item>
+    <item msgid="8272260411216018353">"Op skerm as reëls"</item>
+    <item msgid="120512413928262547">"In adb-dop dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen agtergrondprosesse"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8a1004d..761de2f 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Vliegtuigmodus"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Meer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerke"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, mobiele netwerke en VPN\'s"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, mobiele netwerke en VPN\'e"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataswerwing"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Verbind aan datadienste wanneer swerf"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Verbind aan datadienste wanneer swerf"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Voer teks in om op die sluitskerm te wys"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Wys gebruikerinligting op sluitskerm"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Gebruikerinligting"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Wys profiel-inligting op slotskerm"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiel-inligting"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Liggingstoegang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sekuriteit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Toesteladministrasie"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Toesteladministrateurs"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Sien of deaktiveer toesteladministrateurs"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Skakel Bluetooth aan"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Draadlose skerm"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Skakel draadlose skerm aan on toestelle te sien."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Draadlose skerm is gedeaktiveer omdat Wi-Fi af is."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Draadlose skerm is gedeaktiveer omdat Wi-Fi af is."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Soek na skerms"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Soek tans…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Geen nabygeleë draadlose skerms is gevind nie."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer hierdie funksie aangeskakel is, kan jy programinhoud na \'n ander NFC-toestel oorsein deur die toestelle naby aan mekaar te hou. Jy kan byvoorbeeld blaaierbladsye, YouTube-video\'s, Mense-kontakte en meer oorsein. "\n" "\n"Bring bloot die toestelle bymekaar (gewoonlik rug teen rug) en raak dan aan jou skerm. Die program bepaal wat oorgesein word."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Netwerkdiens-ontdekking"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Laat programme op ander toestelle toe om programme op hierdie toestel te ontdek"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Skakel Wi-Fi aan"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi-instellings"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Skakel Wi-Fi aan"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-instellings"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Stel en beheer draadlose toegangspunte"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Kies Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Skakel tans Wi-Fi aan…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Skakel tans Wi-Fi af…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Kies Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Skakel tans Wi-Fi aan…"</string>
+    <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="3038290727701553612">"Stel my in kennis wanneer \'n oop netwerk beskikbaar is"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vermy swak verbindings"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hou Wi-Fi aan tydens sluimer"</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_scan_always_available" msgid="3470564139944368030">"Skandering altyd beskikbaar"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Laat Google se liggingdiens en ander programme skandeer vir netwerke, selfs wanneer Wi-Fi af is"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Installeer sertifikate"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Om akkuraatheid te verbeter en vir ander doeleindes, kan Google en ander programme dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programme kan dalk skandeer vir nabygeleë netwerke, selfs wanneer Wi-Fi af is. As jy nie wil hê dat dit gebeur nie, gaan na Gevorderd &gt; Skandering altyd beskikbaar."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Moenie weer wys nie"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hou Wi-Fi aan tydens sluimer"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kon nie die instelling verander nie"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi-optimalisering"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimaliseer batterygebruik wanneer Wi-Fi aan is"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimaliseer batterygebruik wanneer Wi-Fi aan is"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Voeg netwerk by"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerke"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-netwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-drukknoppie"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Meer opsies"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-invoering"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Soek tans vir Wi-Fi-netwerke..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Soek tans vir Wi-Fi-netwerke…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jy het nie toestemming om die Wi-Fi-netwerk te verander nie."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Nog"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Outomatiese opstelling (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Om opstelling te voltooi, moet jou tablet toegang hê tot Wi-Fi. Na opstelling kan jy wissel tussen mobiele data en Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Om opstelling te voltooi, moet jou tablet toegang hê tot Wi-Fi. Na opstelling kan jy wissel tussen mobiele data en Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Wys gevorderde opsies"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskermde opstelling"</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="7204827509934892103">"Druk die Wi-Fi-beskermde-opstelling-knoppie op jou roeteerder. Dit word moontlik \"WPS\" genoem of bevat hierdie simbool:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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 te voltooi."</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_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="5754399645462924103">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS is reeds besig en kan tot twee minute neem om te voltooi"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS het misluk. Probeer asseblief oor \'n paar minute weer."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die koordlose roeteerder se sekuriteitsinstelling (WEP) word nie ondersteun nie"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Stawingmislukking. Probeer asseblief weer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Nog \'n WPS-sessie is opgespoor. Probeer asseblief oor \'n paar minute weer."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netwerk-SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Voer die SSID in"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sekuriteit"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Seinsterkte"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Weier"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koppel"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netwerkverbinding het misluk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeet"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Moenie oorslaan nie"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"LET WEL: Jy kan moontlik ekstra diensverskaffer-datakoste aangaan."\n\n"Tablet-opstelling kan beduidende netwerkaktiwiteit vereis."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"LET WEL: Jy kan moontlik ekstra diensverskaffer-datakoste aangaan."\n\n"Foon-opstelling kan beduidende netwerkaktiwiteit vereis."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"LET WEL: Die tablet sal nie kan verifieer dat jou sagteware op datum is nie."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"LET WEL: Die foon sal nie kan verifieer dat jou sagteware op datum is nie."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Die tablet kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Die foon kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gevorderde Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekwensieband"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"LET WEL: Die tablet sal nie kan verifieer of jou sagteware op datum is totdat jy \'n internetverbinding het nie."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"LET WEL: Die foon sal nie kan verifieer of jou sagteware op datum is todat jy \'n internetverbinding het nie."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Die tablet kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Die foon kon nie aan hierdie Wi-Fi-netwerk koppel nie."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gevorderde Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi-frekwensieband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Spesifiseer die frekwensieomvang van die bewerking"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Kon nie die frekwensiebandwydte instel nie."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Deurgang"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkvoorvoegsel"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Toestelinligting"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Onthou hierdie verbinding"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Soek vir toestelle"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselleer uitnodiging?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil jy die uitnodiging kanselleer om met <xliff:g id="PEER_NAME">%1$s</xliff:g> te koppel?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vergeet hierdie groep?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare Wi-Fi-warmkol"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Skakel tans Wi-Fi-warmkol aan..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Skakel tans Wi-Fi-warmkol af..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Wi-Fi-warmkol <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktief"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met Wi-Fi-warmkol"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Stel Wi-Fi-warmkol op"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Fout met draagbare Wi-Fi-warmkol"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Stel Wi-Fi-warmkol op"</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="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
@@ -765,7 +787,7 @@
     <string name="fcc_equipment_id" msgid="149114368246356737">"Toerusting-ID"</string>
     <string name="baseband_version" msgid="1848990160763524801">"Basisbandweergawe"</string>
     <string name="kernel_version" msgid="9192574954196167602">"Kernweergawe"</string>
-    <string name="build_number" msgid="3075795840572241758">"Bou-nommer"</string>
+    <string name="build_number" msgid="3075795840572241758">"Bounommer"</string>
     <string name="selinux_status" msgid="6212165375172061672">"SELinux-status"</string>
     <string name="device_info_not_available" msgid="8062521887156825182">"Nie beskikbaar nie"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Status"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Seinsterkte"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Swerwing"</string>
     <string name="status_operator" msgid="2274875196954742087">"Netwerk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC-adres"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi-MAC-adres"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Reeksnommer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Onbeskikbaar"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN is geaktiveer"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN gedeaktiveer"</string>
     <string name="bearer" msgid="594270280031923558">"Draer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-tipe"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-waarde"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Vee toegangspunt uit"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuwe toegangspunt"</string>
     <string name="menu_save" msgid="8109345640668285399">"Stoor"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hulp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerke"</string>
     <string name="location_title" msgid="1029961368397484576">"My ligging"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi en selnetwerk se ligging"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- en mobielenetwerk-ligging"</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="7457348712272184793">"Ligging deur Wi-Fi vasgestel"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ligging deur Wi-Fi vasgestel"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satelliete"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Laat programme toe om GPS op jou tablet te gebruik om jou ligging presies vas te stel"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Laat programme toe om GPS op jou foon te gebruik om jou ligging presies vas te stel"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Kies filteropsies"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Gedeaktiveer"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Afgelaai"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Loop tans"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-berging"</string>
@@ -1136,11 +1161,14 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Voorkeur-installeerligging"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Verander die voorkeur-installeerligging vir nuwe programme."</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktiveer ingeboude program?"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"As jy \'n ingeboude program deaktiveer, kan ander hulle programme wangedra."</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"As jy \'n ingeboude program deaktiveer, kan ander programme hulle dalk wangedra."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vee data uit en deaktiveer program?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"As jy \'n ingeboude program deaktiveer, kan ander programme hulle wangedra. Jou data sal ook uitgevee word."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wil jy kennisgewings afskakel?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"As jy kennisgewings vir hierdie program afskakel, kan jy moontlik belangrike waarskuwings en opdaterings mis."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Programwerkinge"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Loop tans"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nooit gebruik nie)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Geheuegebruik"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Sien berging wat deur programme gebruik word"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Lopende dienste"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Woord:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Kortpad:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Taal:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Tik \'n woord in"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Opsionele kortpad"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redigeer woord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redigeer"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Vee uit"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fisiese sleutelbordinstellings"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Ontwikkelaaropsies"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Stel opsies vir programontwikkeling"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Ontwikkelaar-opsies is nie beskikbaar vir hierdie gebruiker nie"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-ontfouting"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"In ontfoutmodus wanneer USB gekoppel is"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Herroep USB-onfoutingmagtigings"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Kragkieslys se foutverslae"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Sluit opsie in die kragkieslys in vir die neem van \'n foutverslag"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Bly wakker"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Laat ontwikkeling-instellings toe?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Hierdie instellings is bedoel net vir ontwikkelinggebruik. Dit kan jou toestel en die programme daarop breek of vreemde dinge laat doen."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifieer programme oor USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Kragknoppie beëindig oproep"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sê wagwoorde hardop"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Raak-en-hou-vertraging"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Verbeter webtoeganklikheid"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Instellings"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aan"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Af"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Toegelaat"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nie toegelaat nie"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Laat toe"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Moenie toelaat nie"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Gebruik <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan al die teks wat jy invoer, behalwe wagwoorde, versamel. Dit sluit persoonlike inligting in, soos kredietkaartnommers. Dit kan ook data oor jou interaksie met die tablet versamel."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan al die teks wat jy invoer, behalwe wagwoorde, versamel. Dit sluit persoonlike inligting in, soos kredietkaartnommers. Dit kan ook data oor jou interaksie met die foon versamel."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Raak van OK sal <xliff:g id="SERVICE">%1$s</xliff:g>-diens stop."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Neem jou handelinge waar"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Ontvang kennisgewings wanneer jy met \'n program omgaan."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"As jy OK raak, sal <xliff:g id="SERVICE">%1$s</xliff:g> stop."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen dienste geïnstalleer nie"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Soek jy \'n skermleser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bied gesproke terugvoer om blindes en gebruikers met swak sig te help. Wil jy dit gratis vanaf Android Market installeer?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Wil jy dat programme skripte van Google installeer wat hul webinhoud meer toeganklik sal maak?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beskrywing verskaf nie."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellings"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Laai"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skerm aan"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aan"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Wakker"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sein van mobiele netwerk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi betyds"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi betyds"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi betyds"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi betyds"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Geskiedenisdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Gebruikdetails"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Verstel kraggebruik"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Ingeslote pakkette"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skerm"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Selgereedheid"</string>
     <string name="power_phone" msgid="5392641106474567277">"Stemoproepe"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hou wakker"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi aan"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aan"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Foon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data gestuur"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Programinligting"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Program-instellings"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Skerminstellings"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi-instellings"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi-instellings"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellings"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Battery gebruik deur stemoproepe"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery word gebruik wanneer tablet ledig is"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Skakel oor na vliegtuigmodus om krag te spaar in areas met geen seldekking nie"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Battery gebruik deur skerm en agterlig"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Verminder die skermhelderheid en/of skermuittelling"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Battery deur Wi-Fi gebruik"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Skakel Wi-Fi af wanneer dit nie gebruik word nie of as dit nie beskikbaar is nie"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Battery deur Wi-Fi gebruik"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Skakel Wi-Fi af wanneer dit nie gebruik word nie of as dit nie beskikbaar is nie"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Battery deur Bluetooth gebruik"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Skakel Bluetooth af as jy dit nie gebruik nie"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Probeer koppel aan \'n ander bluetooth-toestel"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Stel op"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Kies \'n ander enjin"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hierdie spraaksintese-enjin kan dalk al die teks versamel wat uitgespreek sal word, insluitend persoonlike data soos wagwoorde en kredietkaartnommers. Dit kom van die <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> enjin. Aktiveer die gebruik van hierdie spraaksintese-enjin?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Hierdie taal vereis \'n werkende netwerkverbinding vir teks-na-spraak-uitvoer."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Enjins"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> instellings"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is geaktiveer"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Voorkeur-enjin"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Algemeen"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kragbeheer"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Opdateer Wi-Fi-instelling"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Dateer Wi-Fi-instelling op"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Werk Bluetooth-instelling by"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"aan"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"af"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"skakel aan"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"skakel af"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinkroniseer"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Bergingtipe"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteun"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Net sagteware"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Rugsteun en laai terug"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlike data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Rugsteun my data"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Rugsteun programdata, Wi-Fi-wagwoorde en ander instellings na Google-bedieners"</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="auto_restore_title" msgid="5397528966329126506">"Outomatiese teruglaai"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nuwe wagwoord en bevestiging stem nie ooreen nie"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Rugsteunwagwoord kon nie ingestel word nie"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hou op om jou Wi-Fi-wagwoorde, boekmerke, ander instellings, en programdata te rugsteun en vee al die kopieë op Google-bedieners uit?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Hou op om jou Wi-Fi-wagwoorde, boekmerke, ander instellings en programdata te rugsteun en vee al die kopieë op Google-bedieners uit?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Toesteladministrasie-instellings"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Toesteladministrateur"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiveer"</string>
@@ -1528,12 +1560,12 @@
     <string name="untitled_apn" msgid="1230060359198685513">"Titelloos"</string>
     <string name="sound_category_sound_title" msgid="1488759370067953996">"Algemeen"</string>
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Kennisgewings"</string>
-    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Oproep se luitoon en vibreer"</string>
+    <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Oproep se luitoon en vibrasie"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Stelsel"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-opstelling"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Koppel aan Wi-Fi  netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Koppel tans aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi-opstelling"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Koppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Koppel tans aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Voeg \'n netwerk by"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nie gekoppel nie"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Voeg netwerk by"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Verbind tans…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Gaan na die volgende stap"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP word nie ondersteun nie"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Jy kan nie \'n EAP-WiFi-verbinding tydens opstelling konfigureer nie. Na opstelling kan jy dit doen in Instellings, onder Wi-Fi en netwerke."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Jy kan nie \'n EAP-Wi-Fi-verbinding tydens opstelling konfigureer nie. Na opstelling kan jy dit doen in Instellings, onder Wi-Fi en netwerke."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Verbinding kan \'n paar minute neem..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Raak "<b>"Volgende"</b>" om voort te gaan met opstelling."\n\n"Raak "<b>"Terug"</b>" om aan \'n ander Wi-Fi-netwerk te koppel."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" om voort te gaan met opstelling."\n\n"Raak "<b>"Terug"</b>" om aan \'n ander Wi‑Fi-netwerk te koppel."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasie geaktiveer"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasie gedeaktiveer"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinkroniseerfout."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Ontfoutde program wag vir ontfouter om te heg voordat dit uitgevoer word"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Invoer"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Skets"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardeware-versnelde lewering"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitering"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strengmodus geaktiveer"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Flits skerm as programme lang handelinge doen op die hoofdraad"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Van die beste na die slegste: blou, groen, ligrooi, rooi"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiveer HW-oorleggers"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Aktiveer spore"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Kies geaktiveerde spore"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Geen spore is tans geaktiveer nie"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spore tans geaktiveer"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle spore is tans geaktiveer"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiveer OpenGL-spore"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Wys uitleg se grense"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Wys snitgrense, kantlyne, ens."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Dwing gebruik van GPU vir 2D-tekening"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Dwing 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Aktiveer 4x MSAA in OpenGL ES 2.0-programme"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Ontfout nie-reghoekige knipbedrywighede"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profiel se GPU-lewering"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Meet leweringstyd in die adb-dop dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimasieskaal"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Oorganganimasieskaal"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator-tydsduurskaal"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Agtergrondproses-limiet"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Wys alle ANRe"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Wys Program reageer nie-dialoog vir agtergrond programme"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Gebruik eksperimentele WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Programme sal die jongste (beta) WebView gebruik"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Datagebruiksiklus"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dataswerwing"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Beperk agtergronddata"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Aparte 4G-gebruik"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wys Wi-Fi-gebruik"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wys Wi-Fi-gebruik"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Wys Ethernet-gebruik"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobiele warmkolle"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sinkroniseer data outomaties"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Stel mobieldatalimiet"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Stel 4G-datalimiet"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Stel 2G-3G datalimiet"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Stel Wi-Fi se datalimiet"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Stel Wi-Fi se datalimiet"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiel"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien die datagebruik deur jou tablet gemeet word en jou diensverskaffer dit dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Jou mobiele dataverbinding sal gedeaktiveer word wanneer die gespesifiseerde limiet bereik word."\n\n"Aangesien datagebruik deur jou foon gemeet word en jou diensverskaffer gebruik dalk anders bereken, oorweeg dit maar om \'n konserwatiewe limiet te gebruik."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beperk agtergronddata?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"As jy agtergrondmobieldata beperk, sal sommige programme en dienste nie werk nie, tensy jy gekoppel is aan \'n Wi-Fi-netwerk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"As jy agtergrond mobiele data beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"As jy agtergrond mobiele data beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"As jy mobiele data in die agtergrond beperk, sal sommige programme en dienste nie werk tensy jy aan \'n Wi-Fi-netwerk gekoppel is nie."\n\n"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarsku"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwyderde programme"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou tablet. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> is gebruik, soos gemeet deur jou foon. Jou diensverskaffer kan datagebruik dalk anders bereken."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiele warmkolle"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Kies die Wi-Fi-netwerke wat mobiele warmkolle is. Programme kan beperk word om hierdie netwerke te gebruik wanneer hulle in die agtergrond is. Programme kan ook waarsku voor hierdie netwerke gebruik word vir groot aflaaisels."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Kies die Wi-Fi-netwerke wat mobiele warmkolle is. Programme kan beperk word om hierdie netwerke te gebruik wanneer hulle in die agtergrond is. Programme kan ook waarsku voor hierdie netwerke gebruik word vir groot aflaaisels."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Selnetwerke"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-netwerke"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Om mobiele warmkolle te kies, skakel Wi-Fi aan."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi-netwerke"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Om mobiele warmkolle te kies, skakel Wi-Fi aan."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Keer terug na oproep"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Toestemmend"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Pas toe"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Jy"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Ander gebruikers"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Voeg gebruiker by"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktief"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Nieaktief"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profiele"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Voeg gebruiker of profiel by"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Beperkte profiel"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Voordat jy \'n beperkte profiel kan skep, moet jy \'n skermslot opstel om jou programme en persoonlike data te beskerm."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Stel slot op"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nie opgestel nie"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nie opgestel nie - beperkte profiel"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eienaar"</string>
-    <string name="user_nickname" msgid="5148818000228994488">"Kennaam"</string>
+    <string name="user_you" msgid="1639158809315025986">"Jy (<xliff:g id="NAME">%s</xliff:g>)"</string>
+    <string name="user_nickname" msgid="5148818000228994488">"Bynaam"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Voeg by"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gebruikers het hul eie programme en inhoud"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Jy kan toegang tot programme en inhoud op jou rekening beperk"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkte profiel"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Voeg nuwe gebruiker by"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie ruimte, wat hulle met hul eie programme, muurpapier, ensovoorts, kan pasmaak. Gebruikers kan ook tabletinstellings verstel, soos Wi-Fi, wat almal affekteer."\n\n"Nadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan."\n\n"Enige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Jy kan hierdie toestel met ander mense deel deur bykomende gebruikers te skep. Elke gebruiker het sy eie ruimte, wat hulle met hul eie programme, muurpapier, ensovoorts kan pasmaak. Gebruikers kan ook tabletinstellings verstel wat almal affekteer, soos Wi-Fi."\n\n"Nadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan."\n\n"Enige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Nadat jy \'n nuwe gebruiker geskep het, moet daardie persoon deur \'n opstelproses gaan."\n\n"Enige gebruiker kan opgedateerde programtoestemmings namens al die ander gebruikers aanvaar."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Moet die gebruiker nou opgestel word?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Maak seker dat die persoon beskikbaar is om die tablet te vat en hulle area op te stel"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Stel profiel nou op?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Stel nou op"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nie nou nie"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Net die eienaar van die tablet kan gebruikers bestuur."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Net die eienaar van die foon kan gebruikers bestuur."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Beperkte profiele kan nie rekeninge byvoeg nie"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Vee <xliff:g id="USER_NAME">%1$s</xliff:g> van hierdie toestel af uit"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuwe gebruiker"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nuwe profiel"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Verwyder jouself?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Verwyder gebruiker?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Verwyder profiel?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Jy sal jou ruimte en data op hierdie tablet verloor. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Jy sal jou ruimte en data op hierdie foon verloor. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Hierdie gebruiker se ruimte en data sal van hierdie tablet af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Hierdie gebruiker se ruimte en data sal van hierdie foon af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Hierdie profiel se ruimte en data sal van hierdie tablet af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Hierdie profiel se ruimte en data sal van hierdie foon af verdwyn. Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Voeg tans nuwe gebruiker by..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Vee gebruiker uit"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Vee uit"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Hierdie instelling beïnvloed alle gebruikers op hierdie tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Hierdie instelling beïnvloed alle gebruikers op hierdie foon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Verander taal"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Seluitsendings"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Kies die tipe noodwaarskuwings wat vertoon moet word."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Program- en inhoudbeperkings"</string>
+    <string name="user_rename" msgid="8523499513614655279">"HERNOEM"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Stel programlimiete"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Laat die wysiging van Bluetooth-saambindings en instellings toe"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Laat dataruiling toe wanneer die foon aan \'n ander toestel raak"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Liggingtoegang"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Laat programme jou ligginginligting gebruik"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Terug"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Volgende"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Klaar"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Neem foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Kies foto vanuit galery"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index d4d49f2..443bad2 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"አዘግይ"</item>
     <item msgid="1145554631248513562">"መደበኛ"</item>
     <item msgid="7553665153391107454">"ፈጣን"</item>
-    <item msgid="2538100882620724753">"በጣም ፈጣን"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"ምንም"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"የለም"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"ያልተገለጸ"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"ምንም"</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">"የውስጥ መሣሪያ ማከማቻ"</item>
     <item msgid="3738430123799803530">"ተወጋጅ SD ካርድ"</item>
     <item msgid="4498124044785815005">"ስርዓቱ ይወስን"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"መገኛ ስፍራ"</item>
+    <item msgid="255608127647030286">"የግል"</item>
+    <item msgid="4588829735729884491">"መልዕክት መላኪያ"</item>
+    <item msgid="8971765125227378270">"መሣሪያ"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ግምታዊ አካባቢ"</item>
+    <item msgid="5789673140227507995">"ትክክለኛ አካባቢ"</item>
+    <item msgid="1061584358377390581">"ጂ ፒ ኤስ"</item>
+    <item msgid="5387405117297558954">"ንዘር"</item>
+    <item msgid="3434165993711230924">"እውቂያዎችን አንብብ"</item>
+    <item msgid="616161687718081936">"ዕውቂያዎችዎን ይቀይሩ"</item>
+    <item msgid="7638002295329050091">"የጥሪ ምዝግብ ማስታወሻን ያንብቡ"</item>
+    <item msgid="6546959730920410907">"የጥሪ ምዝግብ ማስታወሻን ይቀይሩ"</item>
+    <item msgid="446877710771379667">"የቀን መቁጠሪያ አንብብ"</item>
+    <item msgid="7674458294386319722">"የቀን መቁጠሪያን ይቀይሩ"</item>
+    <item msgid="8281201165558093009">"የWi-Fi ቅኝት"</item>
+    <item msgid="8694611243479480497">"ማሳወቂያ"</item>
+    <item msgid="7776439107987345446">"የህዋስ ቅኝት"</item>
+    <item msgid="514615766544675057">"ወደ ስልክ ደውል"</item>
+    <item msgid="8181415497109310680">"ኤስ ኤም ኤስን ያንብቡ"</item>
+    <item msgid="6816551144382117307">"ኤስ ኤም ኤስ ይጻፉ"</item>
+    <item msgid="4600463921908905030">"ኤስ ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="5958926493289432745">"አስቸኳይ ኤስ ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="4945269495221089540">"ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="5570472453573929087">"የደልብዩ ኤ ፒ ግፊት ይቀበሉ"</item>
+    <item msgid="7125408150230860501">"ኤስ ኤም ኤስ ይላኩ"</item>
+    <item msgid="7080337936612188061">"የአይ ሲ ሲ ኤስ ኤም ኤስ ያንብቡ"</item>
+    <item msgid="587124103118495063">"የአይ ሲ ሲ ኤስ ኤም ኤስ ይጻፉ"</item>
+    <item msgid="2320577158869025503">"ቅንብሮችን ይቀይሩ"</item>
+    <item msgid="1545733463471924009">"ከላይ ይሳሉ"</item>
+    <item msgid="3609046903962454582">"ማሳወቂያዎችን ድረስ"</item>
+    <item msgid="4671646036128214513">"ካሜራ"</item>
+    <item msgid="1097324338692486211">"ኦዲዮ ቅረጽ"</item>
+    <item msgid="5031552983987798163">"ድምጽ አጫውት"</item>
+    <item msgid="8374996688066472414">"ቅንጥብ መለያ አንብብ"</item>
+    <item msgid="3045529469061083747">"ቅንጥብ መለያ ቀይር"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"አካባቢ"</item>
+    <item msgid="8677040780775113033">"አካባቢ"</item>
+    <item msgid="1660743989948992916">"አካባቢ"</item>
+    <item msgid="8791172739860195290">"ንዘር"</item>
+    <item msgid="383413555642128046">"እውቂያዎችን አንብብ"</item>
+    <item msgid="3654594895269697313">"ዕውቂያዎችዎን ይቀይሩ"</item>
+    <item msgid="7928393476362362538">"የጥሪ ምዝግብ ማስታወሻን ያንብቡ"</item>
+    <item msgid="6248591205254641116">"የጥሪ ምዝግብ ማስታወሻን ይቀይሩ"</item>
+    <item msgid="6093344633066170692">"የቀን መቁጠሪያ አንብብ"</item>
+    <item msgid="1334886368750347692">"የቀን መቁጠሪያን ይቀይሩ"</item>
+    <item msgid="1638204101698708656">"አካባቢ"</item>
+    <item msgid="2154671955760380322">"ማሳወቂያ ለጥፍ"</item>
+    <item msgid="4282477730595931828">"አካባቢ"</item>
+    <item msgid="4891423912898525905">"ወደ ስልክ ደውል"</item>
+    <item msgid="626463821668200388">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="1237538540368797101">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይላኩ"</item>
+    <item msgid="3986142739951490025">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="3984213795861739778">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="3656243523752472788">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="8105802370238551510">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="1407766984645388488">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይላኩ"</item>
+    <item msgid="1530132603376027248">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይቀበሉ"</item>
+    <item msgid="1188256962149204607">"ኤስ ኤም ኤስ/ኤም ኤም ኤስ ይላኩ"</item>
+    <item msgid="4218544235221631789">"ቅንብሮችን ይቀይሩ"</item>
+    <item msgid="736541391767350377">"ከላይ ይሳሉ"</item>
+    <item msgid="5530815681721654194">"ማሳወቂያዎችን ይድረሱ"</item>
+    <item msgid="781213371706962767">"ካሜራ"</item>
+    <item msgid="1720492593061838172">"ኦዲዮ ቅረጽ"</item>
+    <item msgid="3493046322001257041">"ድምጽ አጫውት"</item>
+    <item msgid="136815868796597058">"ቅንጥብ ሰሌዳ አንብብ"</item>
+    <item msgid="5238692940326972503">"ቅንጥብ መለያ ቀይር"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"አጭር"</item>
     <item msgid="2560532955514699713">"መካከለኛ"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (ግራፊክስ)"</item>
     <item msgid="1340692776955662664">"የጥሪ ቁልል በ glGetError ላይ"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"ማያ ገጽ ላይ እንደ አሞሌዎች"</item>
+    <item msgid="8272260411216018353">"ማያ ገጽ ላይ እንደ መስመሮች"</item>
+    <item msgid="120512413928262547">"በ adb shell dumpsys gfxinfo ውስጥ"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"መደበኛ ወሰኖች"</item>
     <item msgid="4071574792028999443">"ምንም የዳራ ሂደቶች የሉም"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 45ba53e..493cb90 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -166,7 +166,7 @@
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"የስልክ አድራሻ ጠይቅ"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s የአንተን ዕውቂያዎች እና የጥሪ ታሪኮች ለመድረስ ይፈልጋል ። ለ%2$s መድረስ ይሰጥ?"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"ዳግመኛ አትጠይቅ"</string>
-    <string name="date_and_time" msgid="4114084177056654663">"ቀን&amp; የሰዓትቅንብሮች"</string>
+    <string name="date_and_time" msgid="4114084177056654663">"የቀን እና ሰዓት ቅንብሮች"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"የጊዜ ሰቅ ምረጥ"</string>
     <string name="normal_date_format" msgid="7636406984925498359">"የአካባቢው (<xliff:g id="DATE">%s</xliff:g>)"</string>
     <string name="display_preview_label" msgid="1127597250917274792">"ቅድመ-ዕይታ"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"የአውሮፕላን ሁነታ"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"ተጨማሪ…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ገመድ አልባ&amp; አውታረ መረቦች"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi፣ብሉቱዝ፣አውሮፕላን ሁነታ፣የተንቀሳቃሽ አውታረመረቦች፣&amp; VPNs አዸራጅ"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi፣ ብሉቱዝ፣ የአውሮፕላን ሁነታ፣ የተንቀሳቃሽ አውታረ መረቦች፣ እና VPNዎችን ያቀናብሩ"</string>
     <string name="roaming" msgid="3596055926335478572">"ውሂብ በእንቅስቃሴ ላይ"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"በእንቅስቃሴ ላይ ሲሆን ወደ ውሂብ አገልግሎቶች ተያያዝ"</string>
@@ -280,10 +280,10 @@
     <string name="roaming_reenable_title" msgid="6068100976707316772">"የውሂብ ዝውውር ፍቀድ?"</string>
     <string name="networks" msgid="6333316876545927039">"የከዋኝ ምርጫ"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"የአውታረ መረብ ከዋኝ ምረጥ"</string>
-    <string name="date_and_time_settings_title" msgid="3350640463596716780">"ቀን&amp; ሰዓት"</string>
+    <string name="date_and_time_settings_title" msgid="3350640463596716780">"ቀን እና ሰዓት"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"ቀን እና ሰዓት አዘጋጅ"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"ቀን፣ ሰዓት፣ የጊዜ ሰቅ&amp; ቅርፀቶች አዘጋጅ"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"ራስ ሰር ቀን &amp; ሰዓት"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"ራስ ሰር ቀን እና ሰዓት"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"በአውታረ መረብ የቀረበ ሰዓት ተጠቀም"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"በአውታረ መረብ የቀረበ ሰዓት ተጠቀም"</string>
     <string name="zone_auto" msgid="334783869352026648">"ራስ ሰር ሰዓት ሰቅ"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"በተቆለፈ ማያ ላይ ለማሳየት ፅሁፍ አስገባ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"የተጠቃሚ መረጃ በመቆለፊያ ማያ ገጹ ላይ አሳይ"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"የተጠቃሚ መረጃ"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"የመገለጫ መረጃ በቁልፍ ማያ ገጽ ላይ አሳይ"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"የመገለጫ መረጃ"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"የአካባቢ መዳረሻ"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"ደህንነት"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
@@ -320,12 +322,12 @@
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን ባበሩ ቁጥር ለመፍታት የቁጥር PIN  ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ሚዲያ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ። ጡባዊ ተኮህን ምስጠራ አፈታት  አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ሚዲያ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ይችላሉ። ጡባዊ ተኮዎን ምስጠራ አፈታት አንዴ ካደረጉ በኋላ፣በእያንዳንዱ ጊዜ ሲያበሩት ላለማመሳጠር የቁጥር ፒን ወይም የይለፍ ቃል መተየብ ያስፈልግዎታል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮዎን አለማመሳጠር አይችሉም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብዎ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮዎ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጡ፣ውሂብዎን አንዳንዱን ወይም ሁሉንም ያጣሉ።"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ  መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።"\n\n" ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ስልክ አመስጥር"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"እባክህ ባትሪህን ኃይል ሙላ እና እንደገና ሞክር።"</string>
-    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"እባክህ የኃይል መሙያዎን ሰካ እና እንደገና ሞክር።"</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"እባክዎ ባትሪዎን ኃይል ይሙላ እና እንደገና ይሞክሩ።"</string>
+    <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"እባክዎ የኃይል መሙያዎን ይሰኩ እና እንደገና ይሞክሩ።"</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"ምንም የማያቆልፍ PIN ወይም ይለፍቃል የለም"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"ምስጠራ ከመጀመርህ በፊት የማያ ቆልፍ PIN ወይም ይለፍቃል ማዘጋጀት አለብህ።"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"ይመስጠር?"</string>
@@ -346,12 +348,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"ማሳያ ቆልፍን ለውጥ"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"ስርዓተ ጥለት፣  PIN፣ ወይም የይለፍ ቃል ለውጥ ወይም አቦዝን"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"ማያውን ለመቆለፍ ሜተድ ምረጥ"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Face Unlock አንተን ማየት ሳይችል ሲቀር ስልኩን እንዴት ማስከፈት ትፈልጋለህ?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"በፊት ገጽ መክፈቻ እርስዎን ማየት ሳይችል ሲቀር ስልኩን እንዴት ማስከፈት ይፈልጋሉ?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"ምንም"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"ተንሸራታች"</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_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>
@@ -359,10 +361,10 @@
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"ከመካከለኛ እስከ ከፍተኛ ጥበቃ"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">" የይለፍ ቃል፡"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"ከፍተኛ ጥበቃ"</string>
-    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ ፖሊሲ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</string>
+    <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"የምስጠራ መምሪያ ወይም ማስረጃ ማከማቻ በአስተዳዳሪ ቦዝኗል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"ተንሸራታች"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"ፊት ክፈት"</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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"መሣሪያ አስተዳደር"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"የመሣሪያ አስተዳዳሪዎች"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"የመሣሪያ አስተዳደሮችን እይ ወይም አቦዝን"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"የማሳወቂያ መዳረሻ"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ብሉቱዝ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">" ብሉቱዝ አብራ"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"ብሉቱዝ"</string>
@@ -475,7 +486,7 @@
     <string name="bluetooth_device_advanced_profile_header_title" msgid="3764437426089639639">"መገለጫ"</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_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_opp_profile_summary_not_connected" msgid="1267091356089086285">"ከፋይል ዝውውር አገልጋይ ጋር አልተያያዘም"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ቅንብሮች አስታውስ"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"ገመድ አልባ ማሳያ"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"መሣሪያዎችን ለማየት የገመድ አልባ ማሳያን ያብሩ።"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wi-Fi ስለጠፋ ገመድ አልባ ማሳያ ተሰናክሏል።"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-Fi ስለጠፋ የገመድ አልባ ማሳያ ተሰናክሏል።"</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ማሳያዎችን ይፈልጉ"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"በመፈለግ ላይ…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"በአቅራቢያ ያሉ ምንም ገመድ አልባ ማሳያዎች አልተገኙም።"</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi አብራ"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi ቅንብሮች"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi ያብሩ"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"የWi-Fi ቅንብሮች"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"አዘጋጅ&amp; የገመድ አልባ ድረስ ነጥብ አደራጅ"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"ገመድ አልባ ምረጥ"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi በማብራት ላይ..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi በማጥፋት ላይ..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi‑Fi ይምረጡ"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi በማብራት ላይ..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi በማጥፋት ላይ..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"ስህተት"</string>
     <string name="wifi_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="3038290727701553612">"ክፍት አውታረመረብ ሲገኝ አሳውቀኝ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ደካማ ግንኙነቶችን አስወግድ"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"ጥሩ የበይነመረብ ግንኙነት ካለው በስተቀር የገመድ አልባ አውታረ መረብን አትጠቀም"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"በምትተኛበት ወቅት WiFi እንደበራ ይሁን"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"ጥሩ የበይነመረብ ግንኙነት ከሌለው በስተቀር የWi-Fi አውታረ መረብ አይጠቀሙ"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"መቃኘት ሁልጊዜ ይገኛል"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"የGoogle የአካባቢ አገልግሎትን እና ሌሎች መተግበሪያዎች አውታረ መረቦችን ለማግኘት እንዲቃኙ ያድርጓቸው፣ Wi-Fi ጠፍቶም ቢሆን እንኳን"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"የእውቅና ማረጋገጫዎችን ይጫኑ"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች Google እና ሌሎች መተግበሪያዎች አጠገብ ያሉ አውታረ መረቦችን ሊቃኙ ይችላሉ፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ። ይሄ እንዲከሰት ካልፈለጉ ወደ የላቀ &gt; መቃኘት ይሂዱ፣ ሁልጊዜ ይገኛል።"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"መተግበሪያዎች አጠገብ ያሉ አውታረ መረቦችን ሊቃኙ ይችላሉ፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ። ይሄ እንዲከሰት ካልፈለጉ ወደ የላቀ &gt; መቃኘት ይሂዱ፣ ሁልጊዜ ይገኛል።"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ዳግመኛ አታሳይ"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"በሚተኛበት Wi-Fi እንደበራ ይቆይ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"ቅንብሮቹን ለመለወጥ ችግር ነበር።"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"የWi-Fi ማመቻቸት"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-Fi ሲበራ የባትሪ አጠቃቀም ይቀነስ"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"የWi-Fi ማመቻቸት"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi ሲበራ የባትሪ አጠቃቀም ቀንስ"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"አውታረ መረብ አክል"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"የWi-Fi  አውታረመረቦች"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"የWi-Fi አውታረ መረቦች"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS ግፊት አዘራር"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"ተጨማሪ አማራጮች"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS ፒን ማስገቢያ"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi ቀጥታ"</string>
+    <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_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"አውታረ መረብ እርሳ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"አውታረ መረብ ቀይር"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"ያሉ አውታረመረቦች ለማየት፣Wi-Fi አብራ።"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"የWi-Fi አውታረ መረቦችን በመፈለግ ላይ…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ያሉ አውታረ መረቦችን ለማየት Wi-Fi ያብሩ።"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"የWi-Fi አውታረ መረቦችን በመፈለግ ላይ…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"የWi‑Fi አውታረ መረቡን የመቀየር ፍቃድ የሉዎትም።"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"ሌላ አውታረ መረብ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"ተጨማሪ"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"በራስ ሰር ማወቀር (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"መዋቀሩን ለማጠናቀቅ ጡባዊዎ የWi-Fi መዳረሻ ያስፈልገዋል። ከተዋቀረ በኋላ በተንቀሳቃሽ ስልክ ውሂብ እና Wi-Fi መካከል መቀያየር ይችላሉ።"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"መዋቀሩን ለማጠናቀቅ ጡባዊዎ የWi-Fi መዳረሻ ያስፈልገዋል። ከተዋቀረ በኋላ በተንቀሳቃሽ ስልክ ውሂብ እና Wi-Fi መካከል መቀያየር ይችላሉ።"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"የላቁ አማራጮችን አሳይ"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"በWi-Fi የተጠበቀ መዋቅር"</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="7204827509934892103">"በራውተርህ ላይ በWi-Fi የሚጠበቀው የማወቀሪያ አዝራርን ተጫን። «WPS» ሊባል ይችላል ወይም ይሄንን ምልክት ያካትታል፦"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"በገመድ አልባ ማዞሪያህ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g> አስገባ። ማዋቀሩ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል።"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"በራውተርዎ ላይ ያለውን በ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="5754399645462924103">"ከ<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi አውታረ መረብ ጋር ተገናኝቷል"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ተገናኝቷል"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS አልተሳካም። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (WEP) አይደገፍም"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"የማረጋገጥ አለመሳካት። እባክህ እንደገና ሞክር።"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"ሌላ የWPS ክፍለ ጊዜ ተገኝቷል። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"አውታረ መረብ SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID ያስገቡ"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ደህንነት"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"የሲግናል ጥንካሬ"</string>
     <string name="wifi_status" msgid="4824568012414605414">"ሁኔታ"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"በ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"፣ በ<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</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_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ከልክል"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"አያይዝ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"እርሳ"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"አትዝለል"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።"\n\n"ጡባዊን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ማስጠንቀቂያ፦ ተጨማሪ የድምጸ ሞደም ተያያዥ ውሂብ ክፍያዎች ሊከሰትብዎ ይችላል።"\n\n"ስልክን ማዋቀር ጉልህ የሆነ የአውታረ መረብ እንቅስቃሴ ሊያስፈልገው ይችላል።"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ማስጠንቀቂያ፦ ጡባዊው ሶፍትዌርዎ የተዘመነ መሆኑን ሊያረጋግጥ አይችልም።"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ማስጠንቀቂያ፦ ስልኩ ሶፍትዌርዎ የተዘመነ መሆኑን ሊያረጋግጥ አይችልም።"</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"ጡባዊው ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"ስልኩ ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"የላቀ Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ተደጋጋሚ Wi-Fi  ድግ"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ማስጠንቀቂያ: የበይነመረብ ግንኙነት እስኪኖርዎት ድረስ ሶፍትዌርዎ የዘመነ መሆኑን ታብሌቱ ማረጋገጥ አይችልም።"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ማስጠንቀቂያ: የበይነመረብ ግንኙነት እስኪኖርዎት ድረስ ሶፍትዌርዎ የዘመነ መሆኑን ስልኩ ማረጋገጥ አይችልም።"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"ጡባዊው ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"ስልኩ ከዚህ የWi-Fi አውታረ መረብ ጋር መገናኘት አልቻለም።"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"የላቀ Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"የWi-Fi ድግግሞሽ ድግ"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"የክወና ድግግሞሽ ጊዜ ርዝመት ግለፅ"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"የተደጋጋሚ ድግ ቅንብር ችግር ነበር።"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC አድራሻ"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"መውጫ"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"የአውታረ መረብ ቅድመ ቅጥያ ርዝመት"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi ቀጥታ"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"መሣሪያ መረጃ"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"ይህን ተያያዥ አስታውስ"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"መሣሪያዎችን ፈልግ"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይሰረዝ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን መሰረዝ ትፈልጋለህ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ይህ ቡድን ይረሳ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"የመገናኛ ነጥብን በማጥፋት ላይ…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ተጓጓዥ ድረስ ነጥቦች<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገባሪ"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">" ተጓጓዥ Wi-Fi ድረስ ነጥብ ስህተት"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-fi መገናኛ ነጥብ አቀናብር"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"የተንቀሳቃሽ የWi-Fi መገናኛ ነጥብ ስህተት"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"የ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="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
@@ -681,11 +703,11 @@
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"ሲነካ ንዘር"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ጫጫታ መቀነሻ"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"ሙዚቃ፣ ቪዲዮ፣ ጨዋታዎች &amp; ሌላ ማህደረ መረጃ"</string>
-    <string name="volume_ring_description" msgid="5936851631698298989">"የጥሪ ድምፅ &amp; ማሳወቂያዎች"</string>
+    <string name="volume_ring_description" msgid="5936851631698298989">"የጥሪ ድምፅ እና ማሳወቂያዎች"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"ማሳወቂያዎች"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"ማንቂያ ደወሎች"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"የደውል ቅላጼ ድምጸ ከል አድርግ &amp; ማስታወቅያዎች"</string>
-    <string name="volume_media_mute" msgid="3399059928695998166">"ሙዚቃ ድምጸ ከል አድርግ &amp; ሌላ ሚዲያ"</string>
+    <string name="volume_media_mute" msgid="3399059928695998166">"ሙዚቃ ድምጸ ከል አድርግ &amp; ሌላ ማህደረ  መረጃ"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"የማሳወቂያ ድምፅ አጥፋ"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ማንቂያ ደወሎችን ድምጸ ከል አድርግ"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"በሚደወልበት ጊዜ ንዘር"</string>
@@ -707,7 +729,7 @@
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
     <string name="account_settings" msgid="6403589284618783461">"መለያዎች"</string>
     <string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክእና ቅንብሮችንአደራጅ"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክ እና ቅንብሮችን ያደራጁ"</string>
     <string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"ማያ በራስ ሰር አሽከርክር"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"የሲግናል ጥንካሬ"</string>
     <string name="status_roaming" msgid="2638800467430913403">"በመንቀሳቀስ ላይ"</string>
     <string name="status_operator" msgid="2274875196954742087">"አውታረመረብ"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"የWi-Fi  MAC አድራሻ"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"የWi-Fi ማክ አድራሻ"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"የብሉቱዝ አድራሻ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"መለያ ቁጥር"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"አይገኝም"</string>
@@ -808,7 +830,7 @@
     <string name="memory_downloads_usage" msgid="3755173051677533027">"የወረዱ"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ፎቶዎች፣ ቪዲዮዎች"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"ኦዲዮ (ሙዚቃ፣ የስልክ ጥሪ ድምፅ፣ ፖድካስቶች ወዘተ)"</string>
-    <string name="memory_media_misc_usage" msgid="235452944021647124">"በየአይነቱ"</string>
+    <string name="memory_media_misc_usage" msgid="235452944021647124">"በየዓይነቱ"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"የተሸጎጠ ውሂብ"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"የተጋራ ማከማቻ ንቀል"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">" SD ካርድ ንቀል"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ነቅቷል"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ተሰናክሏል"</string>
     <string name="bearer" msgid="594270280031923558">"ተሸካሚ"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO አይነት"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO ዋጋ"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN ሰርዝ"</string>
     <string name="menu_new" msgid="3014205883303921729">"አዲስ APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"አስቀምጥ"</string>
@@ -888,14 +912,14 @@
     <string name="error_apn_empty" msgid="6056233831214537267">"APN ባዶ መሆን አይችልም።"</string>
     <string name="error_mcc_not3" msgid="4560171714156251661">"የMCC መስክ 3 አሀዝ መሆን አለበት።"</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"የMNC መስክ 2 ወይም 3 አሀዝ መሆን አለበት።"</string>
-    <string name="restore_default_apn" msgid="8178010218751639581">"ነባሪ የAPN ቅንጅቶችን እነበረበት መልስ"</string>
+    <string name="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="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_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>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ "\n\n"ለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
@@ -932,7 +956,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ተጓጓዥ ድረስ ነጥቦች"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ብሉቱዝ ማያያዝ"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"መሰካት"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"&amp; ተጓጓዥ ድረስ ነጥብ"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"ተጓጓዥ መዳረሻ ነጥብ እና ማገናኛ"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB መሰካት"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB ተያይዟል፣ ለማያያዝ ተመልከት"</string>
@@ -953,11 +977,11 @@
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"ከ<xliff:g id="MAXCONNECTION">%1$d</xliff:g> መሣሪያዎች በላይ ማገናኘት አይቻልም።"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"እገዛ"</string>
-    <string name="network_settings_title" msgid="7967552516440151852">"የተንቀሳቃሽ ስልክአውታረመረብ"</string>
+    <string name="network_settings_title" msgid="7967552516440151852">"የተንቀሳቃሽ ስልክ አውታረመረብ"</string>
     <string name="location_title" msgid="1029961368397484576">"የእኔ  ሥፍራ"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"የWi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"የWi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"ሥፍራ በWi-Fi ይወሰናል"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"አካባቢ በWi-Fi ይታወቃል"</string>
     <string name="location_gps" msgid="8392461023569708478">"የGPS ሳተላይቶች"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"መተግበሪያዎች አካባቢዎትን ለይተው እንዲያስቀምጡ ጡባዊ ቱኮዎ ላይ ያለውን GPS ይጠቀሙ"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"መተግበሪያዎች አካባቢዎትን ለይተው እንዲያስቀምጡ ስልክዎ ላይ ያለውን GPS ይጠቀሙ"</string>
@@ -967,7 +991,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"ስፍራ &amp; የGoogle ፍለጋ"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Google የፍለጋ ውጤቶችን እና ሌላ አገልግሎቶችን ለማሻሻል የእርስዎን ስፍራ ይጠቀሙ።"</string>
     <string name="location_access_title" msgid="7064108942964081243">"ወደ አካባቢዬ መዳረሻ"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"ፍቃድዎን የጠየቁ መተግበሪያዎች የአካባቢ መረጃዎትን ይጠቀሙ"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"የእርስዎን ፍቃድ የጠየቁ መተግበሪያዎች የአካባቢ መረጃዎትን ይጠቀሙ ዘንድ ይፍቀዱ"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"የአካባቢ ምንጮች"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ስለጡባዊ"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ስለስልክ"</string>
@@ -1037,7 +1061,7 @@
     <string name="verify_applications" msgid="2959359554974828518">"መተግበሪያዎችን ያረጋግጡ"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"ሊጎዱ የሚችሉ መተግበሪያዎችን ከልክል ወይም ከመጫናቸው በፊት አስጠንቅቅ"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"የላቁ ቅንብሮች"</string>
-    <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንጅቶች አማራጮ ች አንቃ"</string>
+    <string name="advanced_settings_summary" msgid="4016682978071086747">"ተጨማሪ የቅንብሮች አማራጮች ያንቁ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"የመተግበሪያ መረጃ"</string>
     <string name="storage_label" msgid="8700867073480107253">"ማከማቻ"</string>
     <string name="auto_launch_label" msgid="3012617472833815382">"በነባሪ አስነሳ"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"አጣራ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"የማጣሪያ አማራጮችን ምረጥ"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"ሁሉም"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"ተሰናክሏል"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ወርዷል"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"አሂድ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"የUSB  ማከማቻ"</string>
@@ -1104,7 +1129,7 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"ወደዚህ Android ስርዓት መተግበሪያ ያለ ሁሉም ዝማኔ እንዲራገፍ ይደረጋል::"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ውሂብ አጥራ"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"ለመተግበሪያ ውሂብ ማጽዳት አልተቻለም፡፡"</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ይህ መተግበሪያ የሚከተለውን በጡባዊህ ላይ መድረስ ይችላል፡"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ይህ መተግበሪያ የሚከተለውን በጡባዊዎ ላይ መድረስ ይችላል፡"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"ይህ መተግበሪያ ስልክህ ላይ የሚከተለውን መድረስ ይችላል፡"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"ይህ መተግበሪያ ጡባዊ ቱኮህ ላይ የሚከተለውን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ም ይገኛሉ፦"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"ይህ መተግበሪያ ስልክህ ላይ የሚከተሉትን ሊደርስባቸው ይችላል። አፈጻጸሙን ለማሻሻልና የማህደረ ትውስታውን አጠቃቀም ለመቀነስ ሲባል ከእነኚህ ፍቃዶች ውስጥ አንዳንዶቹ ልክ <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> ባለበት ሂደት ውስጥ ስለሚካሄዱ ለ<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>ም ይገኛሉ፦"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"አንድ አብሮ የተሰራን መተግበሪያ ካሰናከሉ ሌሎች መተግበሪያዎች ያልተገባ ባህሪ ሊያሳዩ ይችላሉ። ውሂብዎ እንዲሁም ይሰረዛል።"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ማሳወቂያዎችን አጥፋ?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"ለእዚህ መተግበሪያ ማሳወቂያዎችን አጥፍተህ ከሆነ፣ አስፈላጊ ማንቂያዎችን እና አዘምኖችን ልታጣ ትችላለህ።"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"መተግበሪያ ops"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"ሩጫ"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(በጭራሽ ስራ ላይ ያልዋለ)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"የማከማቻ ጥቅም"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"በመተግበሪያዎች ጥቅም ላይ የዋለ ማከማቻ እይ"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"አሂድ አገልግሎቶች"</string>
@@ -1178,10 +1206,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"የስርዓት አገልግለቶት ይቁም?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"ይህን የስርዓት አገልግሎት ለማቆም በእርግጥ ትፈልጋለህ? ከፈለክ፣ አጥፍተህ እንደገና እስክታበራው አንዳንድ የጡባዊዎ ገጽታዎች በትክክል መስራት ያቆማሉ ።"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"ይህን አገልግሎት ለማቆም ከፈለግክ አጥፍተህ እንደገና እስክታበራው ድረስ አንዳንድ የስልክህ ገጽታዎች በትክክል መስራት ያቆማሉ ።"</string>
-    <string name="language_settings" msgid="5292716747264442359">"ቋንቋ&amp; ግቤት"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"ቋንቋ&amp; ግቤት"</string>
+    <string name="language_settings" msgid="5292716747264442359">"ቋንቋ እና ግቤት"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"ቋንቋ እና ግቤት"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"የቋንቋ ቅንብሮች"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"ሰሌዳ ቁልፍ &amp; ግቤት ሜተድስ"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"ሰሌዳ ቁልፍ እና የግቤት ዘዴዎች"</string>
     <string name="phone_language" msgid="8870144109924299673">"ቋንቋ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"በራስ-ተካ"</string>
@@ -1220,10 +1248,12 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"ቃል፦"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"አቋራጭ፦"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ቋንቋ፦"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"አንድ ቃል ይተይቡ"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"አማራጭ አቋራጭ"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ቃሉን አርትዕ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"አርትዕ"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ሰርዝ"</string>
-    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"በተጠቃሚ መዝገበ ቃላት ውስጥ ምንም ቃላቶች የለህም። በምናሌ በኩል ቃል ማከል ትችላለህ።"</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"በተጠቃሚ መዝገበ ቃላት ውስጥ ምንም ቃላቶች የልዎትም። በምናሌ በኩል ቃል ማከል ይችላሉ።"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ለሁሉም ቋንቋዎች"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ተጨማሪ ቋንቋዎች…"</string>
     <string name="testing" msgid="6584352735303604146">"ሙከራ"</string>
@@ -1242,9 +1272,9 @@
     <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="input_method" msgid="5434026103176856164">"የግቤት ስልት"</string>
     <string name="current_input_method" msgid="234072873286056438">"ነባሪ"</string>
-    <string name="input_method_selector" msgid="4311213129681430709">"የግቤት ሜተድ መራጭ"</string>
+    <string name="input_method_selector" msgid="4311213129681430709">"የግቤት ስልት መራጭ"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"ራስ ሰር"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"ሁልጊዜ አሳይ"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"ሁልጊዜ ደብቅ"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"የሚዳሰስ ቁልፍሰሌዳ ቅንብሮች"</string>
     <string name="development_settings_title" msgid="215179176067683667">"የገንቢዎች አማራጮች"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"ለመተግበሪያ ግንባታ አማራጮች አዘጋጅ"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"የገንቢ አማራጮች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="enable_adb" msgid="7982306934419797485">"የUSB አራሚ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB ሲያያዝ የአርም ሁኔታ"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"የዩ ኤስ ቢ ስህተት ማረም ፈቀዳዎችን ይሻሩ"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"የኃይል ምናሌ ሳንካ ሪፖርቶች"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"የሳንካ ሪፖርት ለመውሰድ የኃይል ምናሌ ውስጥ አማራጩን ያካትቱ"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"ነቅተህ ቆይ"</string>
@@ -1270,7 +1302,8 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"የUSB አድስ ለግንባታ አላማ ብቻ የታሰበ ነው። ከኮምፒዩተርህ ወደ መሳሪያህ ውሂብ ለመገልበጥ፣ መሣሪያህ ላይ ያለ ማሳወቂያ መተግበሪያዎችን መጫን፣ እና ማስታወሻ ውሂብ ማንበብ ለመጠቀም ይቻላል።"</string>
-    <string name="dev_settings_warning_title" msgid="7244607768088540165">"የግንባታ ቅንጅቶችን ፍቀድ?"</string>
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"የዩ ኤስ ቢ ማረም መዳረሻ ከዚህ ቀደም ፍቃድ ከሰጧቸው ኮምፒውተሮች ላይ ይሻሩ?"</string>
+    <string name="dev_settings_warning_title" msgid="7244607768088540165">"የግንባታ ቅንብሮችን ፍቀድ?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"እነዚህ ቅንብሮች  የታሰቡት ለግንባታ አጠቃቀም ብቻ ናቸው። መሳሪያህን እና በሱ ላይ ያሉትን መተግበሪያዎች እንዲበለሹ ወይም በትክክል እንዳይሰሩ ሊያደርጉ ይችላሉ።"</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"መተግበሪያዎች በUSB በኩል ያረጋግጡ"</string>
     <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"በADB/ADT በኩል የተጫኑ መተግበሪያዎች ጎጂ ባህሪ ካላቸው ያረጋግጡ።"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"የኃይል አዘራር ጥሪውን ይዘገዋል"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"የይለፍ ቃላትን ተናገር"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ይንኩ እና ዝጌታን ይዘው ይቆዩ"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"የድር ተደራሽነት አሻሽል"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ቅንብሮች"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"በርቷል"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ጠፍቷል"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"ተፈቅዷል"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"አይፈቀድም"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"ፍቀድ"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"አትፍቀድ"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g> ይጠቀም?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> የምትተይበውን ፅሁፍ ሁሉ፣  ከይለፍ ቃል በስተቀር መሰብሰብ ይችላል። ይህም እንደ የብድር ካርድ ያሉ ለግል የተበጁ ውሂብ ቁጥሮችን ያካትታል። እንዲሁም ከስልኩ ጋር ያለህን በይነ ግኑኙነት ውሂብ መሰብሰብ ይችላል።"</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> የምትተይበውን ፅሁፍ ሁሉ፣  ከይለፍ ቃል በስተቀር መሰብሰብ ይችላል። ይህም እንደ የብድር ካርድ ያሉ ለግል የተበጁ ውሂብ ቁጥሮችን ያካትታል። እንዲሁም ከስልኩ ጋር ያለህን በይነ ግኑኙነት ውሂብ መሰብሰብ ይችላል።"</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g> ይቁም?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"እሺ መንካት <xliff:g id="SERVICE">%1$s</xliff:g> ያስቆማል።"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"እርምጃዎችዎን ይከታተሉ"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"ከአንድ መተግበሪያ ጋር መስተጋብር ሲፈጥሩ ማሳወቂያዎች ይቀበሉ።"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ይቁም?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"እሺን መንካት <xliff:g id="SERVICE">%1$s</xliff:g>ን ያስቆማል።"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ምንም አገልግሎቶች አልተጫኑም"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"የማያ ማንበቢያ ያስፈልጋል?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ማየት ለተሳናቸው እና ዝቅተኛ የማየት አቅም ላላቸው ተጠቃሚዎች የንግግር ግብረ መልስ ያቀርባል፡፡ በነጻ ከ Android Market ልትጭነው ትፈልጋለህ?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"የድረ ይዘታቸውን የበለጠ ተደራሽ የሚያደርግ ከGoogle ላይ የትግበራ ስክሪፕቶች ለመጫን ይፈልጋሉ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ምንም መግለጫ አልቀረበም።"</string>
     <string name="settings_button" msgid="3006713718908152930">"ቅንብሮች"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"ባትሪ"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"ኃይል በመሙላት ላይ"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"ማያ በርቷል"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS በርቷል"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ነቃ"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"የተንቀሳቃሽ ስልክ አውታረ መረብ ማመልከት"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"የመሣሪያማንቂያ ሰዓት"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi በጊዜ"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi በጊዜ"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi በጊዜ"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi በጊዜ"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"የታሪክ ዝርዝሮች"</string>
     <string name="details_title" msgid="3792801565213935385">"ዝርዝሮች ተጠቀም"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"የኃይል አጠቃቀም አስተካክል"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"የታከሉ አካታቾች"</string>
     <string name="power_screen" msgid="3023346080675904613">"ማያ"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ብሉቱዝ"</string>
     <string name="power_cell" msgid="6596471490976003056">"የስልክ ተጠባበቅ"</string>
     <string name="power_phone" msgid="5392641106474567277">"የድምፅ ጥሪዎች"</string>
@@ -1367,9 +1395,9 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ ፈታ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ጠቅላላ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ቅድመ ገፅ"</string>
-    <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ በል"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"ነቃ ብሏል"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi ማስኬድ"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fiን በማስኬድ ላይ"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"ጡባዊ"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"ስልክ"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"ውሂብ ተልኳል"</string>
@@ -1382,31 +1410,31 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"የመተግበሪያ መረጃ"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"መተግበሪያ ቅንብሮች"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"የማያ ቅንብሮች"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi ቅንብሮች"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"የWi-Fi ቅንብሮች"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"የብሉቱዝ ቅንብሮች"</string>
-    <string name="battery_desc_voice" msgid="8980322055722959211">"የድምፅ ጥሪዎች የተጠቀሙበት ባትሪመጠን"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"የድምፅ ጥሪዎች የተጠቀሙበት ባትሪ መጠን"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"ጡባዊ ስራ ፈት ሲሆን ባትሪ ተጠቅሟል"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"ስልክ ሲቦዝን የተጠቀመበት ባትሪ መጠን"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"የስልክ ሬዲዮ የተጠቀመበት ባትሪመጠን"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"የስልክ ሬዲዮ የተጠቀመበት ባትሪ መጠን"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"ምንም የአውታረመረብ ሽፋን የሌለበትአካባቢ ኃይል ለመቆጠብ ወደ አውሮፕላን ሁነታ ቀይር"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"በማሳያ እና የኋላብርሃንየተጠቀመበት ባትሪመጠን"</string>
-    <string name="battery_sugg_display" msgid="3370202402045141760">"የማያን ብሩህነት እና/ወይም የማያማብቂያጊዜቀንስ"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi  የተጠቀመበት ባትሪመጠን"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"ሳትጠቀምበት ወይም በሌለበት ቦታ Wi-Fi ን አጥፋ"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"በማሳያ እና የኋላብርሃን የተጠቀመበት ባትሪ መጠን"</string>
+    <string name="battery_sugg_display" msgid="3370202402045141760">"የማያን ብሩህነት እና/ወይም የማያ ማብቂያ ጊዜ ቀንስ"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi የተጠቀመበት የባትሪ መጠን"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"ካልተጠቀምክበት ወይም በሌለበት ቦታ ላይ Wi-Fi ን አጥፋ"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"ብሉቱዝ የተጠቀመበት ባትሪ መጠን"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"ሳትጠቀምበት ስትቀር ብሉቱዝን አጥፋ"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ወደ ተለየ የብሉቱዝ መሣሪያ ለማገናኘት ሞክር"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"በመተግበሪያ ጥቅም ላይ የዋለ ባትሪ"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"መተግበሪያውን አትጫን ወይም አቁም"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"መተግበሪያ እንዳይጠቀም ለመከላከል GPSን በእጅ ተቆጣጠር።"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንጅቶችን ሊያቀርብ ይችላል"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"መተግበሪያው የባትሪ ፍጆታን ለመቀነስ ቅንብሮችን ሊያቀርብ ይችላል"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"በተጠቃሚው ስራ ላይ የዋለው ባትሪ"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g>ከተነቀለ ጀምሮ"</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"በመጨረሻ ለ<xliff:g id="UNPLUGGED">%1$s</xliff:g>  አልተሰካም"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ጠቅላላ አጠቃቀም"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"አድስ"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Android  ስርዓተ ክወና"</string>
-    <string name="process_mediaserver_label" msgid="6500382062945689285">"ማህደረመረጃአገልጋይ"</string>
+    <string name="process_mediaserver_label" msgid="6500382062945689285">"ማህደረ መረጃ አገልጋይ"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"የድምፅ ግቤት &amp; ውፅአት"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"የድምፅ ግቤት &amp; ውፅአት ቅንብሮች"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"የድምፅ ፍለጋ"</string>
@@ -1418,7 +1446,7 @@
     <string name="tts_settings" msgid="8186971894801348327">"ፅሁፍ-ወደ-ንግግር ቅንብሮች"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"የፅሁፍ- ወደ- ንግግር ውፅዓት"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"ሁልጊዜም የእኔን ቅንብሮች ተጠቀም"</string>
-    <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"ከስር ያሉ ነባሪ ቅንብሮች የመተግበሪያ  ቅንጅቶችን ያግዳሉ"</string>
+    <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>
@@ -1433,11 +1461,12 @@
     <string name="tts_install_data_title" msgid="4264378440508149986">"የድምፅ ውሂብ ጫን"</string>
     <string name="tts_install_data_summary" msgid="5742135732511822589">"ለንግግር ልምምድ የሚጠየቀውን የድምፅ ውሂብ ጫን"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"ለንግግር ልምምድ የሚጠየቁ ድምፆች አስቀድመው በአግባቡ ተጭነዋል"</string>
-    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ቅንብሮችዎተለውጠዋል።ይህ ምንድምፅእንደሚያወጡ ምሳሌነው።"</string>
+    <string name="tts_settings_changed_demo" msgid="4926518555912328645">"ቅንብሮችዎ ተለውጠዋል።ይህ ምን ድምፅ እንደሚያወጡ ምሳሌ ነው።"</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"የመረጥከው አንቀሳቃሽ አይሄድም።"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"አዋቅር"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"ሌላ አንቀሳቃሽ ምረጥ"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ይህ የንግግር ልምምድ አንቀሳቃሽ የሚነገረውን ፅሁፍ ሁሉ  እንደ ይለፍ ቃል እና የዱቤ ካርድ ቁጥሮች፣ የግል ውሂብ ጨምሮ ለመሰብሰብ ይችል ይሆናል።  ከ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> አንቀሳቃሽ ይመጣል። የዚህን የንግግር ልምምድ አንቀሳቃሽ አጠቃቀም ይንቃ?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"ይህ ቋንቋ የጽሑፍ-ወደ-ንግግር ውጽዓት እንዲኖረው የሚሰራ የአውታረ መረብ ግንኙነት ያስፈልገዋል።"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"አንቀሳቃሾች"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>ቅንብሮች"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ተችሏል"</string>
@@ -1451,18 +1480,18 @@
     <string name="pico_voice_summary_male" msgid="8331266854058577610">"ወንድ"</string>
     <string name="tts_notif_engine_install_title" msgid="7000346872482649034">"የንግግር ልምምድ አንቀሳቃሽ ተጭኗል"</string>
     <string name="tts_notif_engine_install_message" msgid="7250804349781973329">"አዲስ አንቀሳቃሽ ከመጠቀምህ በፊት አንቃ።"</string>
-    <string name="tts_engine_settings_button" msgid="1030512042040722285">"ሞተር ቅንጅቶችን አስጀምር"</string>
-    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"የተመረጠ ሞተር"</string>
+    <string name="tts_engine_settings_button" msgid="1030512042040722285">"የፍርግም ቅንብሮችን ያስጀምሩ"</string>
+    <string name="tts_engine_preference_section_title" msgid="448294500990971413">"የተመረጠ ፍርግም"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"አጠቃላይ"</string>
     <string name="gadget_title" msgid="5519037532720577836">"የኃይል መቆጣጠሪያ"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"የWi-Fi ቅንብር ማዘመን"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"የWi-Fi ቅንብርን በማዘመን ላይ"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"የብሉቱዝቅንብር ማዘመን"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"በርቷል"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"ጠፍቷል"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"በማብራት ላይ"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"በማጥፋት ላይ"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ብሉቱዝ"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"አመሳስል"</string>
@@ -1481,10 +1510,13 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ሁሉንም ምስክሮችአስወግድ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA  ምስክር አሳይ"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"የማከማቻ አይነት"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"በሃርድዌር የተደገፈ"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"ሶፍትዌር ብቻ"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
-    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍቃልን ተይብ::"</string>
+    <string name="credentials_unlock_hint" msgid="2301301378040499348">"ለምስክርነት ማረጋገጫ ማከማቻ የይለፍ ቃልን ይተይቡ።"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"የአሁኑ ይለፍ ቃል፡"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"ሁሉንም ይዘቶች አስወግድ?"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"የይለፍ ቃሉ ቢያንስ 8 ቁምፊዎች አሉት።"</string>
@@ -1497,13 +1529,13 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"የማስረጃ ማከማቻ ከመጠቀምህ በፊት የማያ ፒን ወይም ይለፍ ቃል ቆልፍ ማዘጋጀት አለብህ።"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"የአደጋ ጊዜ ድምፅ"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"መጠበቂያ &amp; ዳግም አስጀምር"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"መጠበቂያ &amp; ዳግም አስጀምር"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"መጠበቂያ እና ዳግም አስጀምር"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"መጠበቂያ እና ዳግም አስጀምር"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"ምትኬ &amp; እነበረበት መልስ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"የግል ውሂብ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"ውሂቤን መጠባበቂያ"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"ወደ Google አገልጋዮች የመተግበሪያ ውሂብ ፣ የWi-Fi ይለፍ ቃሎች እና ሌላ ቅንብሮች  ተተኪ አኑር"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"መለያ መጠባበቂ"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"የመተግበሪያ ውሂብ፣ የWi-Fi ይለፍ ቃላት እና ሌሎች ቅንብሮች በGoogle አገልጋዮች ላይ መጠባበቂያ ያስቀምጡላቸው"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"መለያ መጠባበቂያ"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"በአሁኑ ጊዜ ምንም መለያ ተተኪ አኑር ውሂብ እያከማቸ አይደለም።"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ራስ ሰር ነበረበት መልስ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"መተግበሪያን ዳግም ስትጭን ምትኬ ቅንብሮች  እና ውሂብ እነበሩበት መልስ"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"አዲሱ የይለፍ ቃል እና ማረጋገጫው አይዛመዱም"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"የምትኬ ይለፍ ቃል ማዋቀር አልተሳካም"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"የአንተን  Wi-Fi ይለፍቃሎችን መጠባበቂያ ማቆም ዕልባቶች ሌሎች ቅንብሮች   እና መተግበሪያ ውሂብ ብሎም ሁሉም Google አገልጋዮች ቅጂዎች ይሰረዙ?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"የWi-Fi ይለፍ ቃላትዎን፣ ዕልባቶችዎን፣ ሌሎች ቅንብሮችዎን፣ እና የመተግበሪያ ውሂብዎን መጠባበቂያ መስራት ይቆም፣ እና እንዲሁም በGoogle አገልጋዮች ላይ ያሉ ቅጂዎችም ይሰረዙ?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"መሣሪያ አስተዳደር ቅንብሮች"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"የመሳሪያ አስተዳደር"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"አቦዝን"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"ማሳወቂያዎች"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"የጥሪ ደውል ቅላጼ እና ንዝረት"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"ስርዓት"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi ጫን"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"ወደ Wi-Fi አውታረመረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> አያይዝ"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"ወደ Wi-Fi አውታረመረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> በማገናኘት ላይ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"ወደ Wi-Fi አውታረመረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ተያይዟል"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"የWi-Fi ውቅር"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ይገናኙ"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር በመገናኘት ላይ..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"ከWi-Fi አውታረ መረብ <xliff:g id="NETWORK_NAME">%s</xliff:g> ጋር ተገናኝቷል"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"አውታረመረብ አክል"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"አልተያያዘም"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"አውታረ መረብ አክል"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"በማገናኘት ላይ…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"ወደ ሚቀጥለው ደረጃ ቀጥል"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP አይደገፍም::"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"በማዘጋጀት ላይ የEAP Wi-Fi ተያያዥ ማዋቀር አትችልም። ካዘጋጀህ በኋላ፣ በገመድ አልባ &amp; አውታረመረብ በቅንጅቶች ውስጥ ማድረግ ትችላለህ::"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"በማዋቀር ላይ ሳሉ የEAP Wi-Fi ግንኙነት ማዋቀር አይችሉም። ካዋቀሩ በኋላ ያንን በቅንብሮች &gt; ገመድ አልባ እና አውታረ መረቦች ውስጥ ማድረግ ይችላሉ።"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ማገናኘቱ የተወሰነ ደቂቃ ሊወስድ ይችላል..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"መጫኑን ለመቀጠል"<b>"ቀጥል"</b>"ንካ።"\n\n"ወደ ተለየ የWi-Fi አውታረመረብ ለማያያዝ "<b>"ተመለስ "</b>"ንካ"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"ማዋቀሩን ለመቀጠል "<b>"ቀጣይ"</b>"ን ይንኩ።"\n\n"ከተለየ የWi-Fi አውታረ መረብ ጋር ለመገናኘት "<b>"ተመለስ"</b>"ን ይንኩ።"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"አሳምርነቅቷል"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"አስምር ቦዝኗል"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"የአሳምር ስህተት።"</string>
@@ -1585,7 +1617,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"ጂሜይል"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"የቀን መቁጠሪያ"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"እውቅያዎች"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">" ወደ Google አመሳስል እንኳን ደህና መጣህ!"</font>\n" ውሂብ ለማመሳሰልየአንተን ዕውቂያዎች፣ ቀጠሮዎች እና ሌሎችም ካለህበት ለመድረስ ለመፍቀድ የGoogle አቀራረብ ።"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">" ወደ Google አመሳስል እንኳን ደህና መጡ!"</font>\n" ውሂብ ለማመሳሰል የእርስዎን ዕውቂያዎች፣ ቀጠሮዎች እና ሌሎችም ካሉበት ለመድረስ እንዲሁም ለመፍቀድ የGoogle አቀራረብ።"</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"የመተግበሪያ ማመሳሰያ ቅንብሮች"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"ውሂብ &amp; ማስመር"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"የይለፍ ቃል ቀይር"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"ስህተቱ የተወገደለት መተግበሪያ ከመፈጸሙ በፊት የስህተት ማስወገጃው እስኪያያዝ ድረስ እየጠበቀው ነው"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"ግብዓት"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"ስዕል"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"የተፋጠነ የሃርድዌር አሰጣጥ"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"ቁጥጥር"</string>
     <string name="strict_mode" msgid="1938795874357830695">"ጥብቅ ሁነታ ነቅቷል"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"ትግበራዎች ረጅም ክንውኖች ወደ ዋና ክሮች ሲያካሂዱ ማያላይ ብልጭ አድርግ።"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"ከምርጡ ወደ መጥፎው፦ ሰማያዊ፣ አረንጓዴ፣ ቀላ ያለ ቀይ፣ ቀይ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"የHW ተደራቢዎችን አሰናክል"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"ፍንጮችን አንቃ"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"የነቁ ፍንጮችን ምረጥ"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"በአሁኑ ጊዜ ምንም ፍንጮች አልነቁም"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"በአሁኑ ጊዜ <xliff:g id="NUM">%1$d</xliff:g> ፍንጮች ነቅተዋል"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"ሁሉም ፍንጮች በአሁኑ ጊዜ ነቅተዋል"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"የ OpenGL ክትትሎችን ያንቁ"</string>
     <string name="debug_layout" msgid="5981361776594526155">"የአቀማመጥ ገደቦችን አሳይ"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"የቅንጥብ ገደቦች፣ ጠርዞች፣ ወዘተ አሳይ"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"ለ2-ልኬት መሳል የGPU ስራ አስገድድ"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA አስገድድ"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA በ OpenGL ES 2.0 መተግበሪያዎች ውስጥ ያንቁ"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"አራት ማእዘን ያልሆኑ የቅንጥብ ክዋኔዎችን ስህተት አርም"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"የGPU ምላሽ መስጠት መዝግብ"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"ምላሽ ለመስጠት የወሰደው ጊዜ በadb shell dumpsys gfxinfo ለካ"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"የዊንዶው እነማ ልኬት ለውጥ"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"የእነማ ልኬት ለውጥ ሽግግር"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"እነማ አድራጊ ቆይታ መለኪያ"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"የዳራ አሂድ ወሰን"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"ሁሉንም ANRs አሳይ"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"ለዳራ ትግበራዎች ምላሽ የማይሰጥ መገናኛ ትግበራ አሳይ"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"የሙከራ WebView ይጠቀሙ"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"መተግበሪያ አዲሱን (ቅድመ-ይሁንታ) WebView ይጠቀማሉ"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"የውሂብ አጠቃቀም"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"የውሂብ አጠቃቀም ዑደት"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"የእንቅስቃሴ ላይ ውሂብ"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"የዳራ ውሂብ ከልክል"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"የ4G አጠቃቀም ለያይ"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"የWi-Fi አጠቃቀም አሳይ"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"የWi-Fi አጠቃቀም አሳይ"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"የEthernet አጠቃቀም አሳይ"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"የተንቀሳቃሽ መገናኛ ነጥቦች"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ውሂብ ራስ-አመሳስል"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን አዘጋጅ"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"የ4G ውሂብ ወሰን አዘጋጅ"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"የ2G-3G ውሂብ ወሰን አዘጋጅ"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"የWi-Fi ውሂብ ወሰን አዘጋጅ"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"የWi-Fi ውሂብ ወሰን አዋቅር"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ኢተርኔት"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"ተንቀሳቃሽ ስልክ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1698,11 +1728,11 @@
     <string name="data_usage_enable_mobile" msgid="986782622560157977">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G ውሂብ"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G ውሂብ"</string>
-    <string name="data_usage_app_settings" msgid="8430240158135453271">"መተግበሪያ ቅንጅቶችን እይ"</string>
-    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"በስተጀርባ ውሂብ አግድ?"</string>
+    <string name="data_usage_app_settings" msgid="8430240158135453271">"መተግበሪያ ቅንብሮችን ይመልከቱ"</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"ዳራ ውሂብ አግድ?"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"የጀርባ ውሂብ በተንቀሳቃሽ ስልክ አውታረ መረብ ላይ አሰናክል። ከተገኙ የተንቀሳቃሽ ስልክ ያልሆኑ አውታረ መረቦች ስራ ላይ ይውላሉ።"</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"ለእዚህ ትግበራ የዳራ ውሂብ ለመገደብ፣ መጀመሪያ የተንቀሳቃሽ ውሂብ ወሰን አዘጋጅ።"</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"በስተጀርባ ውሂብ አግድ?"</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"ዳራ ውሂብ አግድ?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"ይሄ ባህሪ የተንቀሳቃሽ ስልክ አውታረ መረቦች ብቻ የሚገኙ ከሆኑ በጀርባ ውሂብ ላይ የሚወሰኑ መተግበሪያዎች ስራቸውን እንዲያቆሙ ሊያደርግ ይችላል።"\n\n"በመተግበሪያው ቅንብሮች ውስጥ ተገቢ የሆኑ ተጨማሪ የአጠቃቀም መቆጣጠሪያዎችን ልታገኝ ትችላለህ።"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"የተንቀሳቃሽ ስልክ ውሂብ ወሰን ሲያዘጋጁ ብቻ ነው የዳራ ውሂብ መገደብ የሚቻለው።"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ውሂብ ራስ-አመሳስል ይብራ?"</string>
@@ -1718,10 +1748,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"የውሂብ አጠቃቀም መወሰን"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በጡባዊ ቱኮህ መሰረት የሚሰፈር እንደመሆኑ መጠን እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"የተንቀሳቃሽ ስልክ ውሂብ ማገናኛ የተጠቀሰው ገደብ ላይ ሲደረስ ይሰናከላል።"\n\n"የውሂብ አጠቃቀም በስልክህ መሰረት የሚሰፈር እንደመሆኑ መጠን፣ እና ድምጸ ተያያዥ ሞደምህ ለአጠቃቀም በተለየ ሁኔታ ሊሰፍር ስለሚችል፣ ቆጠብ ያለ ገደብ መጠቀሙን ግምት ውስጥ አስገባ።"</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"በስተጀርባ ውሂብ አግድ?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"የተንቀሳቃሽ ውሂብ ዳራን ከገደብከው ወደ Wi-Fi አውታረመረብ ካልተገናኘህ በቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም::"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"የጀርባ ተንቀሳቃሽ ስልክ ውሂብ ከገደቡ አንዳንድ መተግበሪያዎች እና አገልግሎቶች ከWi-Fi አውታረ መረብ ጋር እስካልተገናኙ ድረስ አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"የጀርባ ተንቀሳቃሽ ስልክ ውሂብ ከገደቡ አንዳንድ መተግበሪያዎች እና አገልግሎቶች ከWi-Fi አውታረ መረብ ጋር እስካልተገናኙ ድረስ አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ዳራ ውሂብ አግድ?"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"የተንቀሳቃሽ ስልክ ውሂብ ዳራን ከገደቡ ወደ Wi-Fi አውታረ መረብ ካልተገናኙ በስተቀር አንዳንድ መተግበሪያዎች እና አገልግሎቶች አይሰሩም።"\n\n"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ማስጠንቀቂያ  "</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ወሰን"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"የተወገዱ ትግበራዎች"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>፦ <xliff:g id="TOTAL">%1$s</xliff:g> ገደማ ስራ ላይ ውሏል፣ በጡባዊ ቱኮህ በተለካው መሠረት። የድምጸ ተያያዥህ ውሂብ አጠቃቀም ሒሳብ አያያዝ ሊለይ ይችላል።"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>፦ <xliff:g id="TOTAL">%1$s</xliff:g> ገደማ ስራ ላይ ውሏል፣ በስልክህ በተለካው መሠረት። የድምጸ ተያያዥህ ውሂብ አጠቃቀም ሒሳብ አያያዝ ሊለይ ይችላል።"</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"የተንቀሳቃሽ መገናኛ ነጥቦች"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"የተንቀሳቃሽ መገናኛ ነጥቦች የሆኑ የገመድ አልባ አውታረ መረቦችን ምረጥ። መተግበሪያዎች ጀርባ ውስጥ ሲሆኑ እነዚህን አውታረ መረቦች እንዳይጠቀሙ ሊገደቡ ይችላሉ። መተግበሪያዎች እነዚህን አውታረ መረቦች ለትልልቅ ውርዶች ከመጠቀማቸው በፊት ሊያስጠናቅቁም ይችላሉ።"</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"የተንቀሳቃሽ መገናኛ ነጥቦች የሆኑ የWi-Fi አውታረ መረቦችን ይምረጡ። መተግበሪያዎች ጀርባ ውስጥ ሲሆኑ እነዚህን አውታረ መረቦች እንዳይጠቀሙ ሊገደቡ ይችላሉ። እንዲሁም መተግበሪያዎች እነዚህን አውታረ መረቦች ለትልልቅ ውርዶች ከመጠቀማቸው በፊት ሊያስጠናቅቁም ይችላሉ።"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"የተንቀሳቃሽ ስልክ አውታረ መረብ"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"የገመድ አልባ አውታረ መረቦች"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"የተንቀሳቃሽ መገናኛ ነጥቦችን ለመምረጥ ገመድ አልባን አንቃ።"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"የWi-Fi አውታረ መረቦች"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"የተንቀሳቃሽ መገናኛ ነጥቦችን ለመምረጥ Wi-Fiን ያንቁ።"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"የአደጋ ጊዜ ጥሪ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"ወደ ስልክ ጥሪ ተመለስ"</string>
     <string name="vpn_name" msgid="4689699885361002297">"ስም"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"ፈቃጅ"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"በማስፈጸም ላይ"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ተጠቃሚዎች"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"እርስዎ"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"ሌሎች ተጠቃሚዎች"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"ተጠቃሚ አክል"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"ገቢር"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"ቦዝኗል"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"ተጠቃሚዎች እና መገለጫዎች"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"ተጠቃሚ ወይም መገለጫ አክል"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"የተገደበ መገለጫ"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"የተገደበ መገለጫ መፍጠር ከመቻልዎ በፊት መተግበሪያዎችዎን እና የግል ውሂብዎን ለመጠበቅ ቁልፍ ማያ ገጽ ማዋቀር አለብዎት።"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"ቁልፍ አዘጋጅ"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"አልተዋቀረም"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"አልተዋቀረም - የተገደበ መገለጫ"</string>
     <string name="user_owner" msgid="3879126011135546571">"ባለቤት"</string>
+    <string name="user_you" msgid="1639158809315025986">"እርስዎ (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ቅጽል ስም"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"አክል"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ተጠቃሚዎች የራሳቸው መተግበሪያዎች እና ይዘት አሏቸው"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ከመለያዎ ላይ የመተግበሪያዎች መዳረሻን እና ይዘትን መገደብ ይችላሉ"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"ተጠቃሚ"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"የተገደበ መገለጫ"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"አዲሰ ተጠቃሚ አክል"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ለሌሎች ሰዎች ማጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ የግድግዳ ወረቀት፣ የመሳሰሉት ሊያበጅ የሚችለውን የራሱ ቦታ አለው። ተጠቃሚዎች እንዲሁም ሁሉም ሰው ላይ ተፅዕኖ የሚኖራቸው እንደ Wi-Fi ያሉ የጡባዊ ቅንብሮችን ማስተካከል ይችላሉ።"\n\n"አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።"\n\n"ማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"ተጨማሪ ተጠቃሚዎችን በመፍጠር ይህን መሣሪያ ለሌሎች ሰዎች ማጋራት ይችላሉ። እያንዳንዱ ተጠቃሚ በራሱ መተግበሪያዎች፣ የግድግዳ ወረቀት እና በመሳሰሉት ነገሮች ሊያበጅ የሚችለውን የራሱ ቦታ አለው። ተጠቃሚዎች እንዲሁም ሁሉም ሰው ላይ ተፅዕኖ የሚኖራቸው እንደ Wi-Fi ያሉ የጡባዊ ቅንብሮችን ማስተካከል ይችላሉ።"\n\n"አንድ አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።"\n\n"ማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"አዲስ ተጠቃሚ ከፈጠሩ ያ ሰው በማዋቀር ሂደት ውስጥ ማለፍ አለበት።"\n\n"ማንኛውም ተጠቃሚ ሌሎች ተጠቃሚዎችን ወክሎ የተዘመኑ የመተግበሪያ ፍቃዶችን ሊቀበል ይችላል።"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ተጠቃሚ አሁን ይዋቀር?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ሰውዬው ጡባዊውን ወስዶ ቦታውን እንዲያዋቅር የሚገኝ መሆኑን ያረጋግጡ"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"መገለጫ አሁን ይዋቀር?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"አሁን ያዋቅሩ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"አሁን አይደለም"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"የጡባዊው ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"የስልኩ ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"የተገደቡ መገለጫዎች መለያዎችን ማከል አይችሉም"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>ን ከዚህ መሣሪያ ሰርዝ"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"አዲስ ተጠቃሚ"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"አዲስ መገለጫ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"እራስዎን ይሰርዙ?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"ተጠቃሚ ይወገድ?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"መገለጫ ይወገድ?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"በዚህ ጡባዊ ላይ ቦታዎን እና ውሂብዎን ያጣሉ። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"በዚህ ስልክ ላይ ቦታዎን እና ውሂብዎን ያጣሉ። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"የዚህ ተጠቃሚ ቦታ እና ውሂብ ከዚህ ጡባዊ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"የዚህ ተጠቃሚ ቦታ እና ውሂብ ከዚህ ስልክ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"የዚህ መገለጫ ቦታ እና ውሂብ ከዚህ ጡባዊ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"የዚህ መገለጫ ቦታ እና ውሂብ ከዚህ ስልክ ይጠፋል። ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"አዲስ ተጠቃሚ በማከል ላይ…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ተጠቃሚን ሰርዝ"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ሰርዝ"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"መተግበሪያዎችን እና ይዘትን ይፍቀዱ"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"ገደቦች ያሏቸው መተግበሪያዎች"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"የመተግበሪያዎች ቅንብሮችን ዘርጋ"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ይህ ቅንብር እዚህ ጡባዊ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ይህ ቅንብር እዚህ ስልክ ላይ ያሉት ሁሉም ተጠቃሚዎች ይመለከታቸዋል።"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ቋንቋ ይቀይሩ"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"የፎቶ መታወቂያ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"የስልክ ስርጭቶች"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"የሚታዩ የአስቸኳይ አደጋ ማንቂያዎች አይነቶች ምረጥ።"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"የመተግበሪያ እና የይዘት ገደቦች"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ዳግም ሰይም"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"የመተግበሪያ ገደቦችን ያዋቅሩ"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"የብሉቱዝ ጥምረቶች እና ቅንብሮች መቀየርን ይፍቀዱ"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"ኤን ኤፍ ሲ"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ጡባዊው ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ይፍቀዱ"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ስልኩ ሌላ መሳሪያ ሲነካ የውሂብ ልውውጥ ይፍቀዱ"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"የአካባቢ መዳረሻ"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"መተግበሪያዎች የአካባቢ መረጃዎትን እንዲጠቀሙ ይፍቀዱ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"ተመለስ"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"ቀጣይ"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"ተጠናቅቋል"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"ፎቶ ያንሱ"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"ፎቶ ከማዕከለ ስዕላት ምረጥ"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 6fd3fe9..aaa29c7 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"بطيء"</item>
     <item msgid="1145554631248513562">"عادي"</item>
     <item msgid="7553665153391107454">"سريع"</item>
-    <item msgid="2538100882620724753">"سريع جدًا"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
   <string-array name="wifi_eap_method">
     <item msgid="1160193392455075561">"PEAP"</item>
     <item msgid="7981731051382306293">"طبقة النقل الآمنة"</item>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"لا شيء"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"لا شيء"</item>
     <item msgid="6189918678874123056">"بروتوكول مصادقة كلمات المرور"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"غير محدد"</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">"سعة تخزين الجهاز الداخلية"</item>
     <item msgid="3738430123799803530">"بطاقة SD قابلة للإزالة"</item>
     <item msgid="4498124044785815005">"ترك القرار للنظام"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"الموقع"</item>
+    <item msgid="255608127647030286">"شخصية"</item>
+    <item msgid="4588829735729884491">"المراسلة"</item>
+    <item msgid="8971765125227378270">"الجهاز"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"الموقع التقريبي"</item>
+    <item msgid="5789673140227507995">"الموقع الدقيق"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"اهتزاز"</item>
+    <item msgid="3434165993711230924">"قراءة جهات الاتصال"</item>
+    <item msgid="616161687718081936">"تعديل جهات الاتصال"</item>
+    <item msgid="7638002295329050091">"قراءة سجل المكالمات"</item>
+    <item msgid="6546959730920410907">"تعديل سجل المكالمات"</item>
+    <item msgid="446877710771379667">"قراءة التقويم"</item>
+    <item msgid="7674458294386319722">"تعديل التقويم"</item>
+    <item msgid="8281201165558093009">"فحص Wi-Fi"</item>
+    <item msgid="8694611243479480497">"إشعار"</item>
+    <item msgid="7776439107987345446">"فحص الشبكة الخلوية"</item>
+    <item msgid="514615766544675057">"اتصال هاتفي"</item>
+    <item msgid="8181415497109310680">"قراءة الرسائل القصيرة SMS"</item>
+    <item msgid="6816551144382117307">"كتابة الرسائل القصيرة SMS"</item>
+    <item msgid="4600463921908905030">"تلقي الرسائل القصيرة SMS"</item>
+    <item msgid="5958926493289432745">"تلقي الرسائل القصيرة SMS في حالة الطوارئ"</item>
+    <item msgid="4945269495221089540">"تلقي رسائل الوسائط المتعددة (MMS)"</item>
+    <item msgid="5570472453573929087">"تلقي رسائل WAP push"</item>
+    <item msgid="7125408150230860501">"إرسال رسائل قصيرة SMS"</item>
+    <item msgid="7080337936612188061">"قراءة الرسائل القصيرة SMS لبطاقة ICC"</item>
+    <item msgid="587124103118495063">"كتابة الرسائل القصيرة SMS لبطاقة ICC"</item>
+    <item msgid="2320577158869025503">"تعديل الإعدادات"</item>
+    <item msgid="1545733463471924009">"رسم في الأعلى"</item>
+    <item msgid="3609046903962454582">"إشعارات الدخول"</item>
+    <item msgid="4671646036128214513">"الكاميرا"</item>
+    <item msgid="1097324338692486211">"تسجيل الصوت"</item>
+    <item msgid="5031552983987798163">"تشغيل الصوت"</item>
+    <item msgid="8374996688066472414">"قراءة الحافظة"</item>
+    <item msgid="3045529469061083747">"تعديل الحافظة"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"الموقع"</item>
+    <item msgid="8677040780775113033">"الموقع"</item>
+    <item msgid="1660743989948992916">"الموقع"</item>
+    <item msgid="8791172739860195290">"اهتزاز"</item>
+    <item msgid="383413555642128046">"قراءة جهات الاتصال"</item>
+    <item msgid="3654594895269697313">"تعديل جهات الاتصال"</item>
+    <item msgid="7928393476362362538">"قراءة سجل المكالمات"</item>
+    <item msgid="6248591205254641116">"تعديل سجل المكالمات"</item>
+    <item msgid="6093344633066170692">"قراءة التقويم"</item>
+    <item msgid="1334886368750347692">"تعديل التقويم"</item>
+    <item msgid="1638204101698708656">"الموقع"</item>
+    <item msgid="2154671955760380322">"نشر إشعار"</item>
+    <item msgid="4282477730595931828">"الموقع"</item>
+    <item msgid="4891423912898525905">"اتصال هاتفي"</item>
+    <item msgid="626463821668200388">"تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="1237538540368797101">"إرسال الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3986142739951490025">"تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3984213795861739778">"تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="3656243523752472788">"تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="8105802370238551510">"تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="1407766984645388488">"إرسال الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="1530132603376027248">"تلقي الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="1188256962149204607">"إرسال الرسائل القصيرة SMS/رسائل الوسائط المتعددة"</item>
+    <item msgid="4218544235221631789">"تعديل الإعدادات"</item>
+    <item msgid="736541391767350377">"رسم في الأعلى"</item>
+    <item msgid="5530815681721654194">"إشعارات الدخول"</item>
+    <item msgid="781213371706962767">"الكاميرا"</item>
+    <item msgid="1720492593061838172">"تسجيل الصوت"</item>
+    <item msgid="3493046322001257041">"تشغيل الصوت"</item>
+    <item msgid="136815868796597058">"قراءة الحافظة"</item>
+    <item msgid="5238692940326972503">"تعديل الحافظة"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"قصيرة"</item>
     <item msgid="2560532955514699713">"متوسطة"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (رسومات)"</item>
     <item msgid="1340692776955662664">"تكدس الاستدعاءات في دالة glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"على الشاشة كأشرطة"</item>
+    <item msgid="8272260411216018353">"على الشاشة كخطوط"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"الحد القياسي"</item>
     <item msgid="4071574792028999443">"ليست هناك عمليات بالخلفية"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 85f6ed0..d1185f9 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -46,7 +46,7 @@
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"الحصول على قائمة PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"قيد الخدمة"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"خارج نطاق الخدمة"</string>
-    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"مكالمات الطوارئ فقط"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"مكالمات طوارئ فقط"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"اللاسلكي متوقف"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"تجوال"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"ليس هناك تجوال"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"وضع الطائرة"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"المزيد…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"اللاسلكي والشبكات"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوال والشبكات الظاهرية الخاصة (VPN)"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الظاهرية الخاصة (VPN)"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"اتصال بخدمات البيانات عند التجوال"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"اتصال بخدمات البيانات عند التجوال"</string>
@@ -284,8 +284,8 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"تعيين التاريخ والوقت"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"تعيين التاريخ والوقت والمنطقة الزمنية والتنسيقات"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"التاريخ والوقت التلقائي"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"استخدام الوقت المقدم للشبكة"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"استخدام الوقت المقدم للشبكة"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"استخدام وقت الشبكة"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"استخدام وقت الشبكة"</string>
     <string name="zone_auto" msgid="334783869352026648">"المنطقة الزمنية التلقائية"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"استخدام المنطقة الزمنية للشبكة"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"استخدام المنطقة الزمنية للشبكة"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"اكتب النص الذي سيعرض على شاشة التأمين"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"إظهار معلومات المستخدم في شاشة التأمين"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"معلومات المستخدم"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"إظهار معلومات الملف الشخصي في شاشة التأمين"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"معلومات الملف الشخصي"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"الدخول إلى الموقع"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
@@ -351,7 +353,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"شريحة"</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_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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"إدارة الجهاز"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"مشرفو الجهاز"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"عرض مشرفي الأجهزة أو إلغاء تنشيطهم"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"الدخول إلى الإشعارات"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"تشغيل البلوتوث"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"بلوتوث"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"تذكّر الإعدادات"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"وحدة العرض اللاسلكية"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"للاطلاع على الأجهزة، شغّل وحدة العرض اللاسلكية."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"تم تعطيل وحدة العرض اللاسلكية نظرًا لإيقاف تشغيل شبكة Wi-Fi."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"تم تعطيل وحدة العرض اللاسلكية نظرًا لإيقاف تشغيل شبكة Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"البحث عن وحدات عرض"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"جارٍ البحث..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"لم يتم العثور على وحدات عرض لاسلكية"</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"لاسلكي"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"تشغيل Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"لاسلكي"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"إعدادات Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"لاسلكي"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"تشغيل شبكة Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"إعدادات Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"إعداد وإدارة نقاط الدخول اللاسلكية"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"تحديد Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"جارٍ تشغيل Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"إيقاف Wi-Fi…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"تحديد Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"جارٍ تشغيل Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"إيقاف Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطأ"</string>
     <string name="wifi_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="3038290727701553612">"تنبيهي عند توفر شبكة مفتوحة"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"تجنب الاتصالات الضعيفة"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"الاحتفاظ بـ Wi-Fi أثناء وضع السكون"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"عدم استخدام شبكات Wi-Fi ما لم يكن لها اتصال إنترنت جيد"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"إتاحة الفحص دائمًا"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"السماح لخدمة المواقع في Google والتطبيقات الأخرى بالفحص للوصول إلى شبكات، حتى عند عدم تشغيل Wi-Fi"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"تثبيت شهادات"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"لتحسين مستوى دقة الموقع ولأغراض أخرى، قد تُجري Google والتطبيقات الأخرى فحصًا للعثور على الشبكات القريبة، حتى عندما تكون ميزة Wi-Fi معطّلة. إذا لم تكن تريد إجراء هذا الفحص، فانتقل إلى الإعدادات المتقدمة &gt; إتاحة الفحص دائمًا."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"قد تُجري التطبيقات فحصًا للعثور على الشبكات القريبة، حتى عندما تكون Wi-Fi معطّلة. إذا لم تكن تريد إجراء هذا الفحص، فانتقل إلى الإعدادات المتقدمة &gt; إتاحة الفحص دائمًا."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"عدم الإظهار مرة أخرى"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"الاحتفاظ بتشغيل Wi-Fi أثناء وضع السكون"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"حدثت مشكلة أثناء تغيير الإعدادات"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"تحسين Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"تقليل استخدام البطارية إلى الحد الأدنى عند تشغيل Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"تحسين Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"تقليل استخدام البطارية إلى الحد الأدنى عند تشغيل Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"إضافة شبكة"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"شبكات Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"شبكات Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"زر دفع WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"مزيد من الخيارات"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"إدخال رقم تعريف شخصي في WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"اتصال Wi-Fi مباشر"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"اتصال Wi-Fi مباشر"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"فحص"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"متقدم"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال بالشبكة"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"حذف الشبكة"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"جارٍ البحث عن شبكات Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"لمشاهدة الشبكات المتاحة، شغّل Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"جارٍ البحث عن شبكات Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"ليس لديك إذن لتغيير شبكة Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"شبكة أخرى..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"المزيد"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"الإعداد التلقائي (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"لإكمال الإعداد، يحتاج جهازك اللوحي إلى إمكانية الدخول إلى Wi-Fi. وبعد الإعداد، ستتمكن من التبديل بين بيانات الجوال وWi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"لإكمال الإعداد، يحتاج جهازك اللوحي إلى الدخول إلى Wi-Fi. وبعد الإعداد، ستتمكن من التبديل بين بيانات الجوّال وWi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"عرض الخيارات المتقدمة"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"إعداد Wi-Fi المحمي"</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="7204827509934892103">"اضغط على زر الإعداد المحمي لشبكة Wi-Fi على الموجه. قد يكون اسمه \"WPS\" أو قد يحتوي على الرمز التالي:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"أدخل رقم التعريف الشخصي <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"اضغط على زر الإعداد المحمي لشبكة 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="5754399645462924103">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"إعداد WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتماله فترة قد تصل إلى دقيقتين"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"أخفقت المصادقة. الرجاء إعادة المحاولة."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"تم اكتشاف جلسة WPS أخرى، الرجاء إعادة المحاولة خلال بضع دقائق."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID للشبكة"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"أدخل SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"الأمان"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قوة الإشارة"</string>
     <string name="wifi_status" msgid="4824568012414605414">"الحالة"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"سماح"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"رفض"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"أخفق التوصيل بالشبكة"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"حذف"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"عدم التخطي"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"تحذير: ربما يُحصّل مشغل شبكة الجوال رسومًا إضافية منك."\n\n"قد يحتاج إعداد الجهاز اللوحي إلى نشاط كبير بالشبكة."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"تحذير: ربما يحصّل مشغل شبكة الجوال رسومًا إضافية منك."\n\n"قد يحتاج إعداد الهاتف إلى نشاط كبير بالشبكة."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"تحذير: لن يتمكن الجهاز اللوحي من التحقق من أن البرنامج محدث."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"تحذير: لن يتمكن الهاتف من التحقق من أن البرنامج محدث."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"لم يتمكن الجهاز اللوحي من الاتصال بشبكة Wi-Fi هذه."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"لم يتمكن الهاتف من الاتصال بشبكة Wi-Fi هذه."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"إعدادات Wi-Fi المتقدمة"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"نطاق تردد Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"تحذير: ما لم يتوفر لديك اتصال بالإنترنت، لن يتمكن الجهاز اللوحي من التأكد من أن برنامجك محدّث."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"تحذير: ما لم يتوفر لديك اتصال بالإنترنت، لن يتمكن الهاتف من التأكد من أن برنامجك محدّث."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"لم يتمكن الجهاز اللوحي من الاتصال بشبكة Wi-Fi هذه."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"لم يتمكن الهاتف من الاتصال بشبكة Wi-Fi هذه."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"إعدادات Wi-Fi المتقدمة"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"نطاق تردد Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"حدد نطاق التردد للعملية"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"هناك مشكلة في إعداد نطاق التردد."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"عنوان Mac"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"نظام أسماء النطاقات 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"البوابة"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول بادئة الشبكة"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"اتصال Wi-Fi مباشر"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"اتصال Wi-Fi مباشر"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"معلومات الجهاز"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"تذكر هذا الاتصال"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"البحث عن أجهزة"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"حذف هذه المجموعة؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطة اتصال Wi-Fi المحمولة"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"نقطة اتصال Wi-Fi المحمولة"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"جارٍ تشغيل نقطة الاتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"جارٍ إيقاف نقطة الاتصال…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطة الاتصال المحمولة <xliff:g id="NETWORK_SSID">%1$s</xliff:g> نشطة"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطأ في نقطة اتصال Wi-Fi المتنقلة"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"إعداد نقطة اتصال Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"نقطة اتصال 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_failed_subtext" msgid="1484941858530919002">"خطأ في نقطة اتصال Wi-Fi المحمولة"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"إعداد نقطة اتصال Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"قوة الإشارة"</string>
     <string name="status_roaming" msgid="2638800467430913403">"تجوال"</string>
     <string name="status_operator" msgid="2274875196954742087">"الشبكة"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"عنوان Mac لـ Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"عنوان Mac لشبكة Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"عنوان البلوتوث"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"الرقم المسلسل"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"غير متاح"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"تم تمكين APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"تم تعطيل APN"</string>
     <string name="bearer" msgid="594270280031923558">"الحامل"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"نوع MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"قيمة MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"حذف APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN جديد"</string>
     <string name="menu_save" msgid="8109345640668285399">"حفظ"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"مساعدة"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"شبكات الجوال"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعي"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"شبكة Wi-Fi وموقع شبكة الجوال"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"شبكة Wi-Fi وموقع شبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"الأقمار الصناعية لنظام GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"السماح للتطبيقات باستخدام GPS على جهازك اللوحي لتحديد موقعك"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"السماح للتطبيقات باستخدام GPS على هاتفك لتحديد موقعك"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"تصفية"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"اختر خيارات التصفية"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"الكل"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"معطلة"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"تم التنزيل"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"قيد التشغيل"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"وحدة تخزين USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"عند تعطيل تطبيق مضمن، قد تحدث مشكلات في عمل تطبيقات أخرى. سيتم حذف بياناتك أيضًا."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"هل تريد إيقاف الإشعارات؟"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"إذا كنت قد أجريت إيقافًا للإشعارات حول هذا التطبيق، فقد تفوتك تنبيهات وتحديثات مهمة."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"عمليات التطبيق"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"جارية التنفيذ"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(لم يسبق الاستخدام مطلقًا)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استخدام وحدة التخزين"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"عرض سعة التخزين المستخدمة بواسطة التطبيقات"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"الخدمات قيد التشغيل"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"الكلمة:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"الاختصار:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"اللغة:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"اكتب كلمة"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"اختصار اختياري"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"تعديل كلمة"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"تعديل"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"حذف"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"إعدادات لوحة المفاتيح الفعلية"</string>
     <string name="development_settings_title" msgid="215179176067683667">"خيارات مطور البرامج"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"تعيين خيارات تطوير التطبيق"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"لا تتوفر خيارات مطوّر البرامج لهذا المستخدم"</string>
     <string name="enable_adb" msgid="7982306934419797485">"تصحيح أخطاء USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"وضع تصحيح الأخطاء عند توصيل USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"إلغاء عمليات تفويض تصحيح أخطاء USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"تقارير الخطأ في قائمة الطاقة"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"تضمين خيار في قائمة الطاقة لإنشاء تقرير الأخطاء"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"البقاء في الوضع النشط"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"هل تريد السماح لإعدادات التطوير؟"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"هذه الإعدادات مخصصة لاستخدام التطوير فقط. قد يتسبب هذا في حدوث أعطال أو خلل في أداء الجهاز والتطبيقات المثبتة عليه."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"التحقق من التطبيقات عبر USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"زر الطاقة ينهي الاتصال"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"نطق كلمات المرور"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"مهلة اللمس مع الاستمرار"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"تحسين إمكانية الوصول إلى الويب"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"الإعدادات"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"تشغيل"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"إيقاف"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"مسموح به"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"غير مسموح به"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"السماح"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"عدم السماح"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"هل تريد استخدام <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"يمكن لـ <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> جمع كل النصوص التي تكتبها باستثناء كلمات المرور. ويتضمن ذلك البيانات الشخصية مثل أرقام البطاقات الائتمانية. كما يمكنها جمع بيانات عن تعاملاتك باستخدام الجهاز اللوحي."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"يمكن لـ <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> جمع كل النصوص التي تكتبها باستثناء كلمات المرور. ويتضمن ذلك البيانات الشخصية مثل أرقام البطاقات الائتمانية. كما يمكنها جمع بيانات عن تعاملاتك باستخدام الهاتف."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"سيؤدي لمس \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ملاحظة الإجراءات"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"تلقي إشعارات عند التفاعل مع تطبيق."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"يؤدي لمس \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"لم يتم تثبيت أية خدمات"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"هل تحتاج إلى قارئ شاشة؟"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"يقدم TalkBack تعليقات منطوقة لمساعدة المستخدمين من المكفوفين وضعاف البصر. هل تريد تثبيته مجانًا من Android Market؟"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"هل تريد تثبيت نصوص برمجية من Google بواسطة التطبيقات لتسهيل الدخول إلى محتواها على الويب؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"لم يتم تقديم أي وصف."</string>
     <string name="settings_button" msgid="3006713718908152930">"الإعدادات"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"البطارية"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"شحن"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"الشاشة قيد التشغيل"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS (نظام تحديد المواقع العالمي) على"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"لاسلكي"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"في الوضغ النشط"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"إشارة شبكة الجوال"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"وقت الوضع النشط للجهاز"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"وقت تشغيل Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"وقت تشغيل Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"وقت تشغيل Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"وقت تشغيل Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"تفاصيل السجل"</string>
     <string name="details_title" msgid="3792801565213935385">"تفاصيل الاستخدام"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"ضبط استخدام الطاقة"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"الحزم المضمنة"</string>
     <string name="power_screen" msgid="3023346080675904613">"شاشة العرض"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"لاسلكي"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"بلوتوث"</string>
     <string name="power_cell" msgid="6596471490976003056">"استعداد الخلية"</string>
     <string name="power_phone" msgid="5392641106474567277">"المكالمات الصوتية"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU في المقدمة"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ابق متيقظًا"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi يعمل"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi يعمل"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"الجهاز اللوحي"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"الهاتف"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"تم إرسال البيانات"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"عن التطبيق"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"إعدادات التطبيق"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"إعدادات الشاشة"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"إعدادات Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"إعدادات Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"إعدادات البلوتوث"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"البطارية المستخدمة بواسطة المكالمات الصوتية"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"البطارية المستخدمة عندما يكون الجهاز اللوحي خاملاً"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"تبديل إلى وضع الطائرة للحفاظ على الطاقة في المناطق التي لا توجد بها تغطية للشبكة"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"طاقة البطارية المستخدمة بواسطة العرض والإضاءة الخلفية"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"تقليل سطوع الشاشة و/أو مهلة الشاشة"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"البطارية مستخدمة بواسطة Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"إيقاف Wi-Fi عند عدم استخدامها أو عندما لا تكون متاحة"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"البطارية مستخدمة بواسطة Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"إيقاف Wi-Fi عند عدم استخدامها أو عندما لا تكون متاحة"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"البطارية المستخدمة بواسطة البلوتوث"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"إيقاف البلوتوث عند عدم استخدامك إياه"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"حاول الاتصال بجهاز بلوتوث مختلف"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"تهيئة"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"اختيار محرك آخر"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ربما يمكن لمحرك اصطناع الحديث جمع كل النص التي سيتم نطقه، بما في ذلك البيانات الشخصية مثل كلمات المرور وأرقام بطاقة الائتمان. يتم إحضار ذلك من المحرك <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. هل تريد تمكين استخدام محرك اصطناع الحديث هذا؟"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"تتطلب هذه اللغة اتصال شبكة سليمًا لتحويل النص إلى كلام."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"المحركات"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"إعدادات <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"تم تمكين <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"المحرك المفضل"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"عامة"</string>
     <string name="gadget_title" msgid="5519037532720577836">"التحكم في الطاقة"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"تحديث إعداد Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"تحديث إعداد Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"تحديث إعداد البلوتوث"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"تشغيل"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"إيقاف"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"جارٍ التشغيل…"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"جارٍ إيقاف التشغيل"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"لاسلكي"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوتوث"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"المزامنة"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"إزالة جميع الشهادات"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"بيانات اعتماد موثوقة"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"عرض شهادات CA الموثوقة"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"نوع وحدة التخزين"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"وحدة تخزين صلبة"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"وحدة تخزين برمجية فقط"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ارسم نقش إلغاء القفل"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"النسخ الاحتياطي والاستعادة"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"البيانات الشخصية"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"احتفاظ بنسخة لبياناتي"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"الاحتفاظ بنسخة احتياطية من بيانات التطبيق، وكلمات مرور Wi-Fi، والإعدادات الأخرى على خوادم Google"</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="auto_restore_title" msgid="5397528966329126506">"استرداد تلقائي"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"كلمة المرور الجديدة وتأكيدها لا يتطابقان"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"أخفق تعيين كلمة مرور احتياطية"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"هل تريد إيقاف النسخ الاحتياطي لكلمات مرور Wi-Fi، والإشارات المرجعية والإعدادات الأخرى وبيانات التطبيق ومحو كل النسخ على خوادم Google؟"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"هل تريد إيقاف النسخ الاحتياطي لكلمات مرور Wi-Fi والإشارات المرجعية والإعدادات الأخرى وبيانات التطبيقات ومحو جميع النُسخ على خوادم Google؟"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"إعدادات إدارة الجهاز"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"مشرف الجهاز"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"إلغاء التنشيط"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"التنبيهات"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"نغمة الرنين والاهتزاز عند الاتصال"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"النظام"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"إعداد Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"جارٍ الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"إعداد Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"جارٍ الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"إضافة شبكة"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"غير متصل"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"إضافة شبكة"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"جارٍ الاتصال..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"الانتقال إلى الخطوة التالية"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP غير معتمد."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"لا يمكنك تهيئة اتصال EAP Wi-Fi أثناء الإعداد. بعد الإعداد، يمكنك إجراء ذلك من \"الإعدادات\" &gt; اللاسلكي والشبكات."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"لا يمكنك تهيئة اتصال EAP Wi-Fi أثناء الإعداد. بعد الإعداد، يمكنك إجراء ذلك من الإعدادات &gt; اللاسلكي والشبكات."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"يمكن أن يستغرق الاتصال بضع دقائق..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"المس "<b>"التالي"</b>" للاستمرار في الإعداد."\n\n"المس "<b>"رجوع"</b>" للاتصال بشبكة Wi-Fi مختلفة."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"المس "<b>"التالي"</b>" لمتابعة الإعداد."\n\n"المس "<b>"رجوع"</b>" للاتصال بشبكة Wi‑Fi مختلفة."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"تم تمكين المزامنة"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"ينتظر التطبيق قيد التصحيح انضمام برنامج التصحيح قبل التنفيذ"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"الإدخال"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"رسم"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"عرض تسارع الأجهزة"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"المراقبة"</string>
     <string name="strict_mode" msgid="1938795874357830695">"تم تمكين الوضع المتشدد"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"وميض الشاشة عند إجراء التطبيقات عمليات طويلة في سلسلة المحادثات الرئيسية"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"من الأفضل إلى الأسوأ: أزرق، أخضر، أحمر فاتح، أحمر"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"تمكين الآثار"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"تحديد الآثار الممكنة"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"ليست هناك آثار ممكنة حاليًا"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"تم تمكين <xliff:g id="NUM">%1$d</xliff:g> من الآثار حاليًا"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"تم تمكين جميع الآثار حاليًا"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"تمكين عمليات تتبع OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"عرض حدود المخطط"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"عرض حدود وهوامش المقطع وما إلى ذلك."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"فرض استخدام وحدة معالجة الرسومات للرسم ثنائي الأبعاد"</string>
     <string name="force_msaa" msgid="7920323238677284387">"فرض 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"تمكين 4x MSAA في تطبيقات OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"تصحيح أخطاء عمليات القصاصات غير المستطيلة"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"رسم مخطط لعرض GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"قياس وقت العرض بـ adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"حجم الرسوم المتحركة للنافذة"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"حجم الرسوم المتحركة للنقل"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"طول مدة الرسوم المتحركة"</string>
@@ -1668,16 +1696,18 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"حد العمليات بالخلفية"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"عرض جميع رسائل ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"عرض مربع الحوار \"التطبيق لا يستجيب\" مع تطبيقات الخلفية"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"استخدام WebView التجريبي"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"ستستخدم التطبيقات أحدث إصدار (تجريبي) من WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"استخدام البيانات"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"دورة استخدام البيانات"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"تجوال البيانات"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"تقييد بيانات الخلفية"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"استخدام 4G منفصل"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"عرض استخدام Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"عرض استخدام Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"عرض استخدام إيثرنت"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"نقاط اتصال الجوال"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"مزامنة البيانات تلقائيًا"</string>
-    <string name="data_usage_change_cycle" msgid="7776556448920114866">"تغيير الدائرة…"</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"تغيير الدورة الزمنية…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"يوم من الشهر لإعادة تعيين دورة استخدام البيانات:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"لم يستخدم أي تطبيق البيانات خلال هذه الفترة."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"المقدمة"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"تعيين حد لبيانات الجوال"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"تعيين حد بيانات لـ 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"تعيين حد لبيانات 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"تعيين حد بيانات لـ Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"لاسلكي"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"تعيين حد بيانات لـ Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"إيثرنت"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"الجوال"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"الجيل الرابع"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة جهازك اللوحي، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"سيتم تعطيل اتصال بيانات الجوال عند الوصول إلى الحد المحدد."\n\n"نظرًا لأنه يتم حساب استخدام البيانات بواسطة الهاتف، وقد يحسب مشغل شبكة الجوال الاستخدام بشكل مختلف، يمكنك استخدام حد معتدل."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"هل تريد تقييد بيانات الخلفية؟"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"في حال تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"في حالة تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"في حالة تقييد بيانات الجوال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"في حالة تقييد بيانات الجوّال للخلفية، لن تعمل بعض التطبيقات والخدمات ما لم تكن متصلاً بشبكة Wi-Fi."\n\n"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"تحذير"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"الحد"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"التطبيقات المزالة"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الجهاز اللوحي. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: تم استخدام <xliff:g id="TOTAL">%1$s</xliff:g> تقريبًا، وفقًا لحساب الهاتف. قد يختلف حساب استخدام البيانات لدى مشغل شبكة الجوال."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"نقاط اتصال الجوال"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"حدد شبكات Wi-Fi التي تعد نقاط اتصال جوال. يمكن تقييد استخدام التطبيقات لهذه الشبكات عندما تكون في الخلفية. كما يمكن أن تحصل على تنبيه من التطبيقات قبل استخدام هذه الشبكات مع عمليات التنزيل الكبيرة."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"حدد شبكات Wi-Fi التي تعد نقاط اتصال جوّال. يمكن تقييد استخدام التطبيقات لهذه الشبكات عندما تكون في الخلفية. كما يمكن أن تحصل على تنبيه من التطبيقات قبل استخدام هذه الشبكات مع عمليات التنزيل الكبيرة."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبكات الجوال"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"شبكات Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"لتحديد نقاط اتصال جوال، شغِّل Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"شبكات Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"لتحديد نقاط اتصال جوّال، شغّل Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"الاتصال بالطوارئ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"العودة إلى المكالمة"</string>
     <string name="vpn_name" msgid="4689699885361002297">"الاسم"</string>
@@ -1760,7 +1790,7 @@
     <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>
+    <string name="vpn_edit" msgid="8647191407179996943">"تعديل ملف شخصي لشبكة ظاهرية خاصة"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"الاتصال بـ <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"إضافة ملف شخصي لشبكة ظاهرية خاصة (VPN)"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"متساهل"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"فرض"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"المستخدمون"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"أنت"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"مستخدمون آخرون"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"إضافة مستخدم"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"نشط"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"غير نشط"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"المستخدمون والملفات الشخصية"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"إضافة مستخدم أو ملف شخصي"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"ملف شخصي محظور"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"قبل أن تتمكن من إنشاء ملف شخصي مقيد، يلزمك إعداد تأمين للشاشة لحماية تطبيقاتك وبياناتك الشخصية."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"تعيين التأمين"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"لم يتم الإعداد."</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"لا يُمكن الإعداد - الملف الشخصي محظور"</string>
     <string name="user_owner" msgid="3879126011135546571">"المالك"</string>
+    <string name="user_you" msgid="1639158809315025986">"أنت (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"اللقب"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"إضافة"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"المستخدمون لديهم تطبيقات ومحتوى خاص بهم"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"يمكنك تقييد الدخول إلى التطبيقات والمحتوى من حسابك"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"المستخدم"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"ملف شخصي محظور"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"إضافة مستخدم جديد"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"يمكنك مشاركة هذا الجهاز مع أشخاص آخرين بإنشاء مستخدمين إضافيين. ويكون لكل مستخدم مساحته التي يمكنه تخصيصها بتطبيقاته وخلفياته وما إلى ذلك. ويمكن للمستخدمين أيضًا ضبط إعدادات الجهاز اللوحي مثل Wi-Fi  والتي تؤثر على إعدادات الجميع."\n\n"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد."\n\n"ويمكن لأي مستخدم قبول أذونات التطبيقات المحدثة نيابة عن جميع المستخدمين الآخرين."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"يمكنك مشاركة هذا الجهاز مع أشخاص آخرين من خلال إنشاء مستخدمين إضافيين. ويكون لكل مستخدم مساحته التي يمكنه تخصيصها باستخدام تطبيقاته وخلفياته وما إلى ذلك. ويمكن للمستخدمين أيضًا ضبط إعدادات الجهاز اللوحي مثل Wi-Fi والتي تؤثر على إعدادات الجميع."\n\n"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد."\n\n"ويمكن لأي مستخدم قبول أذونات التطبيقات المحدّثة نيابة عن جميع المستخدمين الآخرين."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"بعد إنشاء مستخدم جديد، يلزم هذا الشخص المرور بعملية الإعداد."\n\n"يمكن لأي مستخدم قبول أذونات التطبيقات المحدثة نيابة عن جميع المستخدمين الآخرين."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هل تريد إعداد المستخدم الآن؟"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"تأكد من أن الشخص متاح لأخذ الجهاز اللوحي وإعداد مساحته."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"هل ترغب في إعداد ملف شخصي الآن؟"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"الإعداد الآن"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ليس الآن"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"يمكن لمالك الجهاز اللوحي فقط إدارة المستخدمين."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"يمكن لمالك الهاتف فقط إدارة المستخدمين."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"لا يمكن للملفات الشخصية إضافة حسابات"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> من هذا الجهاز"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"مستخدم جديد"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"ملف شخصي جديد"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"هل تريد حذف نفسك؟"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"إزالة المستخدم؟"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"هل تريد إزالة الملف الشخصي؟"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"ستفقد مساحتك وبياناتك من هذا الجهاز اللوحي. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"ستفقد مساحتك وبياناتك من هذا الهاتف. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"ستختفي مساحة هذا المستخدم وبياناته من هذا الجهاز اللوحي. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"ستختفي مساحة هذا المستخدم وبياناته من هذا الهاتف. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"ستختفي مساحة هذا الملف الشخصي وبياناته من هذا الجهاز اللوحي. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"ستختفي مساحة هذا الملف الشخصي وبياناته من هذا الهاتف. لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"جارٍ إضافة مستخدم جديد..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"حذف مستخدم"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"حذف"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"السماح بالتطبيقات والمحتوى"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"التطبيقات ذات القيود"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسيع إعدادات التطبيق"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"يؤثر هذا الإعداد على جميع مستخدمي هذا الجهاز اللوحي."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"يؤثر هذا الإعداد على جميع مستخدمي هذا الهاتف."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغيير اللغة"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"عمليات البث الخلوي"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"حدد أنواع تنبيهات الطوارئ لعرضها."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"قيود التطبيقات والمحتوى"</string>
+    <string name="user_rename" msgid="8523499513614655279">"إعادة تسمية"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"تعيين حدود التطبيقات"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"السماح بتعديل اقترانات وإعدادات البلوتوث"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC (الاتصالات قريبة المدى)"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"السماح بتبادل البيانات عندما يلمس الجهاز اللوحي جهازًا آخر"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"السماح بتبادل البيانات عندما يلمس الهاتف جهازًا آخر"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"الدخول إلى الموقع"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"السماح للتطبيقات باستخدام المعلومات حول موقعك"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"رجوع"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"التالي"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"إنهاء"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"التقاط صورة"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"اختيار صورة من المعرض"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index b8a0de1..b4fbef2 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Павольная"</item>
     <item msgid="1145554631248513562">"Звычайная"</item>
     <item msgid="7553665153391107454">"Хуткая"</item>
-    <item msgid="2538100882620724753">"Вельмі хуткая"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Няма"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Не пазначана"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Няма"</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">"Унутраная памяць прылады"</item>
     <item msgid="3738430123799803530">"Зменная SD-карта"</item>
     <item msgid="4498124044785815005">"Няхай вырашыць сістэма"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Месцазнаходжанне"</item>
+    <item msgid="255608127647030286">"Персанальны"</item>
+    <item msgid="4588829735729884491">"Абмен паведамленнямі"</item>
+    <item msgid="8971765125227378270">"Прылада"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"прыблiзнае месцазнаходжанне"</item>
+    <item msgid="5789673140227507995">"дакладнае месцазнаходжанне"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"вібрацыя"</item>
+    <item msgid="3434165993711230924">"чытанне кантактаў"</item>
+    <item msgid="616161687718081936">"змяніць кантакты"</item>
+    <item msgid="7638002295329050091">"чытанне гiсторыi выклікаў"</item>
+    <item msgid="6546959730920410907">"змены ў гiсторыi выклікаў"</item>
+    <item msgid="446877710771379667">"чытанне календара"</item>
+    <item msgid="7674458294386319722">"змяніць каляндар"</item>
+    <item msgid="8281201165558093009">"сканаванне Wi-Fi"</item>
+    <item msgid="8694611243479480497">"апавяшчэнне"</item>
+    <item msgid="7776439107987345446">"сканаванне па сотавым"</item>
+    <item msgid="514615766544675057">"патэлефанаваць па нумары"</item>
+    <item msgid="8181415497109310680">"чытаць SMS"</item>
+    <item msgid="6816551144382117307">"напісаць SMS"</item>
+    <item msgid="4600463921908905030">"атрымліваць SMS"</item>
+    <item msgid="5958926493289432745">"атрымліваць экстранныя SMS"</item>
+    <item msgid="4945269495221089540">"атрымліваць MMS"</item>
+    <item msgid="5570472453573929087">"атрымаць WAP Push"</item>
+    <item msgid="7125408150230860501">"Адправiць SMS"</item>
+    <item msgid="7080337936612188061">"чытанне ICC SMS"</item>
+    <item msgid="587124103118495063">"напiсаць ICC SMS"</item>
+    <item msgid="2320577158869025503">"змяніць налады"</item>
+    <item msgid="1545733463471924009">"намалюйце ўверсе"</item>
+    <item msgid="3609046903962454582">"доступ да паведамленняў"</item>
+    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="1097324338692486211">"запісваць аўдыё"</item>
+    <item msgid="5031552983987798163">"прайграць аўдыё"</item>
+    <item msgid="8374996688066472414">"счытаць буфер абмену"</item>
+    <item msgid="3045529469061083747">"змяніць буфер абмену"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Месцазнаходжанне"</item>
+    <item msgid="8677040780775113033">"Месцазнаходжанне"</item>
+    <item msgid="1660743989948992916">"Месцазнаходжанне"</item>
+    <item msgid="8791172739860195290">"Вібрацыя"</item>
+    <item msgid="383413555642128046">"Чытанне кантактаў"</item>
+    <item msgid="3654594895269697313">"Змяніць кантакты"</item>
+    <item msgid="7928393476362362538">"Чытанне гiсторыi выклікаў"</item>
+    <item msgid="6248591205254641116">"Змяненне запісаў у гiсторыi выклікаў"</item>
+    <item msgid="6093344633066170692">"Чытанне календара"</item>
+    <item msgid="1334886368750347692">"Змена календара"</item>
+    <item msgid="1638204101698708656">"Месцазнаходжанне"</item>
+    <item msgid="2154671955760380322">"Апублiкаваць апавяшчэнне"</item>
+    <item msgid="4282477730595931828">"Месцазнаходжанне"</item>
+    <item msgid="4891423912898525905">"Патэлефанаваць па нумары"</item>
+    <item msgid="626463821668200388">"Прыём SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Адправiць SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Прыём SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Прыём SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Прыём SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Прыём SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Адправiць SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Прыём SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Адправiць SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Змена налад"</item>
+    <item msgid="736541391767350377">"Намалюйце ўверсе"</item>
+    <item msgid="5530815681721654194">"Доступ да паведамленняў"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Запісаць аўдыё"</item>
+    <item msgid="3493046322001257041">"Прайграванне аўдыё"</item>
+    <item msgid="136815868796597058">"Счытаць буфер абмену"</item>
+    <item msgid="5238692940326972503">"Змяніць буфер абмену"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кароткі"</item>
     <item msgid="2560532955514699713">"Сярэдні"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Graphics)"</item>
     <item msgid="1340692776955662664">"Выклікаць стэк на glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"На экране ў выглядзе слупкоў"</item>
+    <item msgid="8272260411216018353">"На экране ў выглядзе ліній"</item>
+    <item msgid="120512413928262547">"У абалонцы adb dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартны ліміт"</item>
     <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 34a8360..1905dc9 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Рэжым самалёту"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Больш..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бесправадныя і правадныя сеткі"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Кіраванне Wi-Fi, Bluetooth, рэжымам палёту, мабільнымі сеткамі і VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Кіраванне Wi-Fi, Bluetooth, рэжымам палёту, мабільнымі сеткамі і VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Перадача дадзеных у роўмінгу"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Злучацца з паслугамі перадачы дадзеных ў роўмінгу"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Злучацца са службамi перадачы дадзеных ў роўмінгу"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Увядзіце тэкст, які адлюстроўваецца на экране блакавання"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Паказаць інфармацыю пра карыстальніка на экране блакiроўкi"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Інфармацыя карыстальніка"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Паказаць звесткi профiлю на экране блакiроўцы"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Звесткi профiлю"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Доступ да месцазнаходжання"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Бяспека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Адміністраванне прылады"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Адміністратары прылады"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Праглядаць або адключаць адміністратараў прылады"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Доступ да апавяшчэння"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Уключыць Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомніць налады"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Бесправадны дысплей"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Каб убачыць прылады, уключыце бесправадны дысплей."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Бесправадны дысплей адключаны, паколькі выключаны Wi-Fi."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бесправадны дысплей адключаны, паколькі выключана Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Пошук дысплеяў"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Пошук..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Паблiзу не знойдзены бесправадныя дысплеi."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Калі гэтая функцыя ўключаная, вы можаце перадаваць змесціва прыкладання на іншыя сумяшчальныя з NFC прылады, утрымліваючы прылады блізка адна да адной. Напрыклад, вы можаце перадаваць старонкi з браўзэра, відэа з 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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Уключыць Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Налады Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Уключыць Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Налады Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Усталяванне бесправадных кропак доступу і кіраванне iмi"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Вылучыце Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Уключэнне Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Адключэнне Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Выберыце Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Уключэнне Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Адключэнне Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Памылка"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"У рэжыме палёту"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не атрымлiваецца выканаць сканаванне для сетак"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Апавяшчэнне сеткі"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Паведаміць мне, калі будзе даступная адкрытая сетка"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Пазбягаць дрэнных злучэнняў"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падлучэння да Інтэрнэта"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Захоўваць Wi-Fi уключаным у рэжыме сну"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не выкарыстоўваць сетку Wi-Fi, пакуль не будзе якаснага падключэння да Інтэрнэту"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканіраванне заўсёды даступнае"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Дазволіць службе вызначэння месцазнаходжання Google і іншым прыкладанням сканіраваць сеткі, нават калі Wi-Fi адключаны"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Усталёўка сертыфікатаў"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Каб палепшыць дакладнасць вызначэння месцазнаходжання і для іншых мэтаў, Google і іншыя прыкладанні могуць сканіраваць бліжэйшыя сеткі, нават калі сувязь Wi-Fi адключаная. Калі вы не хочаце, каб гэта адбывалася, перайдзіце да пункту налад Пашыраныя &gt; Сканіраванне, які заўсёды даступны."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Прыкладанні могуць сканіраваць бліжэйшыя сеткі, нават калі Wi-Fi выключаны. Калі вы не жадаеце, каб гэта адбылося, перайдзіце да пункту \"Пашыраныя &gt; Сканіраванне\", які заўсёды даступны."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Не паказваць зноў."</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Захоўваць Wi-Fi уключанай у рэжыме сну"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Была праблема змены налад"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Аптымiзацыя Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Зменшыць выкарыстанне батарэi, калi ўключаны Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Аптымiзацыя Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Зменшыць выкарыстанне батарэi, калi ўключана Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Дадаць сетку"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Сеткі Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Сеткi Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Больш параметраў"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Увод PIN-кода WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Падлучыцца да сеткі"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Забыцца пра сетку"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змяніць сетку"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Каб праглядзець даступныя сеткi, уключыце Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Пошук сетка Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Каб праглядзець даступныя сеткi, уключыце Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Пошук сеткI Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"У вас няма дазволу на змяненне сеткі Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Іншая сетка..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Дадатковая інфармацыя"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аўтаматычная ўсталёўка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Для завяршэння ўсталёўкі планшэта неабходны доступ да Wi-Fi. Пасля ўсталёўкі вы можаце пераключацца паміж мабільнай перадачай дадзеных і Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Для завяршэння ўсталёўкі планшэта неабходны доступ да Wi-Fi. Пасля ўсталёўкі вы можаце пераключацца паміж мабільнай перадачай дадзеных i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Паказаць дадатковыя параметры"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка Wi-Fi"</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="7204827509934892103">"Націсніце кнопку Wi-Fi Protected Setup на маршрутызатары. Яна можа называцца \"WPS\" ці ўтрымліваць гэты знак:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Увядзіце PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> для маршрутызатара Wi-Fi. Усталёўка можа заняць да дзвюх хвілін."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Націсніце кнопку 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="5754399645462924103">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Не атрымалася ўсталяваць WPS. Паўтарыце спробу праз некалькі хвілін."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налады бяспекі бесправаднога маршрутызатара (WEP) не падтрымліваюцца"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Памылка аўтэнтыфікацыі. Паўтарыце спробу."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Iншыя сеансы WPS не знойдзены. Паўтарыце спробу праз некалькі хвілін."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ідэнтыфікатар SSID сеткі"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Увядзіце SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Бяспека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Магутнасць сігнала"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Стан"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Абаронены з дапамогай <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", абароненых з дапамогай <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Дазволіць"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Адхiлiць"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Падлучыцца"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не атрымалася падключыцца да сеткі"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забыць"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Не прапускаць"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"УВАГА: ваш аператар можа патрабаваць дадатковую аплату за перадачу дадзеных."\n\n" Наладка планшэта можа запатрабаваць значнай сеткавай актыўнасці."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"УВАГА: ваш аператар можа патрабаваць дадатковую аплату за перадачу дадзеных."\n\n" Наладка тэлефона можа запатрабаваць значнай сеткавай актыўнасці."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"УВАГА: планшэт не зможа правяраць, цi абноўлена ваша праграмнае забеспячэнне."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"УВАГА: тэлефон не зможа правяраць, цi абноўлена ваша праграмнае забеспячэнне."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Планшэт не змог падключыцца да гэтай сеткі Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Тэлефон не змог падключыцца да гэтай сеткі Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Пашыраны Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Дыяпазон частот Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"УВАГА: Пакуль у вас няма падключэння да Iнтэрнэту, планшэт не зможа праверыць, цi абноўлена праграмнае забеспячэнне."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"УВАГА: Пакуль у вас няма падключэння да Iнтэрнэту, тэлефон не зможа праверыць, цi абноўлена праграмнае забеспячэнне."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшэт не змог падключыцца да гэтай сеткі Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Тэлефон не змог падключыцца да гэтай сеткi Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Пашыраны Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Дыяпазон частаты Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Удакладніць рабочы дыяпазон частот"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Праблема налады дыяпазону частот."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрас"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Даўжыня прэфікса сеткі"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Інфармацыя пра прыладу"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомніць гэтае злучэнне"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Пошук прылад"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Адмяніць запрашэнне?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы жадаеце адмяніць запрашэнне на падлучэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Iгнараваць гэту групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Партатыўная кропка доступу Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Партатыўная кропка доступу Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Кропка доступу <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Памылка партатыўнай кропкі доступу Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Налада кропкi доступу Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Партатыўная кропка доступу 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_failed_subtext" msgid="1484941858530919002">"Памылка партатыўнай кропкі доступу Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Наладка кропкi доступу Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Гук"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Магутнасць сігналу"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Роўмінг"</string>
     <string name="status_operator" msgid="2274875196954742087">"Сетка"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC-адрас"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адрас Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрас Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Парадкавы нумар"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Адсутнічае"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN уключаны"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN адключаны"</string>
     <string name="bearer" msgid="594270280031923558">"Прад\'яўнік"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Тып MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Значэнне MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Выдаліць APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Новы APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Захаваць"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Даведка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мабільныя сеткі"</string>
     <string name="location_title" msgid="1029961368397484576">"Маё месцазнаходжанне"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Месцазнаходжанне Wi-Fi і мабiльнай сеткi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Месцазнаходжанне Wi-Fi і мабiльнай сеткi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дазвольце прыкладанням выкарыстоўваць службу вызначэння месцазнаходжання, каб хутчэй вас знаходзiць. Ананiмныя дадзеныя пра месцазнаходжанне будуць збiрацца i адпраўляцца ў Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Месца вызначаецца праз Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Месцазнаходжанне вызначаецца праз Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS спадарожнікі"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Дазволіць прыкладанням выкарыстоўваць GPS, каб дакладна вызначаць ваша месцазнаходжанне"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Дазволіць прыкладанням выкарыстоўваць GPS, каб дакладна вызначаць ваша месцазнаходжанне"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Фільтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберыце параметры фільтра"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Усе"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Адключаныя"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Спампавана"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Выконваецца"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-назапашвальнік"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Калі вы адключыце ўбудаванае прыкладанне, іншыя прыкладанні могуць дрэнна працаваць. Вашы дадзеныя таксама будуць выдаленыя."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Адключыць апавяшчэнні?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Калі адключыць паведамлення для гэтага прыкладання, вы можаце прапусціць важныя сігналы і абнаўленні."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Параметры прыкладанняў"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Выконваецца"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Не выкарыстоўваецца)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Выкарыстанне сховішча"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Паглядзець месца, якое выкарыстоўваюць прыкладанні"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Запушчаныя службы"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слова:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Шлях хуткага доступу:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Мова:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Увядзіце слова"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Дадатковы цэтлiк"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Рэдагаваць слова"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Рэдагаваць"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Выдаліць"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Налады фізічнай клавіятуры"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Опцыі распрацоўшчыка"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Налада параметраў для распрацоўкі прыкладанняў"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Параметры распрацоўшчыка недаступныя для гэтага карыстальніка"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Адладка USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Рэжым адладкі, калі USB падключаны"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Адклікаць дазвол USB-адладкі"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Справаздачы пра меню сiлкавання"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Уключыце параметр у меню сiлкавання, каб прыняць справаздачу пра памылку"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Прадухіляць ад пераходу ў рэжым сну"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дазволіць несапраўдныя месцы"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дазволіць адладку USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Адладка USB прызначана толькі для мэтаў распрацоўкі. Яна можа выкарыстоўвацца, каб капіяваць дадзеныя паміж кампутарам і прыладай, усталёўваць прыкладанні на прыладзе без папярэдняга апавяшчэння і чытаць дадзеныя дзённiка."</string>
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"Адклікаць доступ да адладцы USB з усіх камп\'ютараў, на якiх вы уваходзiлi ў сiстэму?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Дазволiць налады распрацоўшчыка?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Гэтыя налады прызначаны толькi для распрацоўшыкаў. Яны могуць выклікаць збоi прылад i ўсталяваных на iх прыкладанняў, а таксама перашкаджаць iх працы."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Праверце прыкладаннi па USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Нац. на кнопку сілкавання зав. выклік"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Прамовіць паролі"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Дакраніцеся і затрымайце"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Павышэнне даступнасці вэб-сайтаў"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налады"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"На"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Адключана"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дапускаецца"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Забаронена"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дазволіць"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Не дазваляць"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Служба <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> можа збіраць увесь уводзімы тэкст за выключэннем пароляў (напрыклад, такiя асабістыя дадзеныя, як нумары крэдытных карт). Яна таксама можа збіраць дадзеныя аб вашым узаемадзеянні з прыладай."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Служба <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> можа збіраць увесь уводзімы тэкст за выключэннем пароляў (напрыклад, такiя асабістыя дадзеныя, як нумары крэдытных карт). Яна таксама можа збіраць дадзеныя аб вашым узаемадзеянні з тэлефонам."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Спыніць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Служба <xliff:g id="SERVICE">%1$s</xliff:g> спынiцца, калi вы дакранецеся да кнопкі \"ОК\"."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Назірайце за сваімi дзеяннямi"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Атрымлівайце апавяшчэннi, калі вы ўзаемадзейнічаеце з прыкладаннем."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Спыніць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Служба <xliff:g id="SERVICE">%1$s</xliff:g> спынiцца, калi вы дакранецеся да кнопкі \"ОК\"."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма ўсталяваных службаў"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Патрэбная праграма для чытання з экрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Прыкладанне TalkBack забяспечвае вусную зваротную сувязь, каб дапамагаць сляпым карыстальнікам і карыстальнікам з дрэнным зрокам. Усталяваць яго бясплатна з Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Жадаеце, каб прыкладанні ўсталявалі скрыпты ад Google, якія зробяць іх змесціва ў Iнтэрнэце больш даступным?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма апісання."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налады"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарэя"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Зарадка"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Экран уключаны"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS уключаная"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Рэжым сна адкл."</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сігнал мабільнай сеткі"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Час з моманту ўключэння прылады"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi у тэрмін"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi у тэрмін"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi у тэрмін"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi у тэрмiн"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Падрабязнасці гісторыі"</string>
     <string name="details_title" msgid="3792801565213935385">"Падрабязнасці выкарыстання"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Адрэгуляваць спажыванне энергіі"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Уключаныя пакеты"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Рэжым чакання тэлефона"</string>
     <string name="power_phone" msgid="5392641106474567277">"Галасавыя выклікі"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Асноўнае выкарыстанне працэсару"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Не ўвах. у рэжым сна"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi працуе"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi працуе"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшэт"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Тэлефон"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Пераданыя дадзеныя"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Звесткі пра прыкладанне"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Налады прыкладання"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Налады экрана"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Налады Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"налады Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Налады Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Выкарыстанне акумулятара для галасавых выклікаў"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Акумулятар выкарыстоўваецца, калі планшэт знаходзіцца ў рэжыме чакання"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Пераключыцеся ў рэжым палёту, каб захаваць зарад акумулятара ў раёнах, дзе няма мабільнага пакрыцця"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Выкарыстанне акумулятара экранам і падсветкай"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Паменшыць яркасць экрана і/або час да адключэння экрана"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Выкарыстанне акумулятару модулем Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Выключаць Wi-Fi, калі не выкарыстоўваецца або калі недаступна"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Выкарыстанне акумулятару модулем Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Выключаць Wi-Fi, калі яна не выкарыстоўваецца або калі недаступна"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Батарэя выкарыстоўваецца Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Выключаць Bluetooth, калі ён не выкарыстоўваецца"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Паспрабаваць злучыцца з іншай прыладай Bluetooth"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Наладзіць"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Выбраць іншы модуль"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Гэты модуль сінтэзу гаворкі можа збіраць увесь тэкст, які будзе прамоўлены, у тым ліку асабістыя дадзеныя, напрыклад паролі і нумары крэдытных карт. Ён адносіцца да модуля <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Уключыць гэты модуль сінтэзу гаворкі?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Гэта мова патрабуе актыўнага падключэння да сеткі, каб выконваць функцыю прамаўлення тэксту."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Модулi"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Налады модулю <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Модуль <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> уключаны"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Выбраны модуль"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Агульныя"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Кіраванне сілкаваннем"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Абнаўленне налад Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Абнаўленне налад Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Абнаўленне налад Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"укл."</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"выкл."</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"уключэнне"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключэнне"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Сінхранiзацыя"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Выдаліць усе сертыфікаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Давераныя паўнамоцтвы"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Паказаць правераныя сертыфікаты CA"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Тып захоўвання"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Рэзерваванае апаратнымі сродкамі"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Толькі праграмнае забеспячэнне"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйце графiчны ключ разблакоўкі"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Каб пацвердзіць усталёўку ўлiковых дадзеных, намалюйце графiчны ключ разблакоўкі."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Рэзервовае капіяванне і аднаўленне"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Асабістыя дадзеныя"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Рэзервовае капіяванне дадзеных"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Рэзервовае капіяванне дадзеных прыкладанняў, пароляў Wi-Fi і іншых параметраў на серверы Google"</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="auto_restore_title" msgid="5397528966329126506">"Аўтаматычнае аднаўленне"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Новы пароль і яго пацвярджэнне не супадаюць"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Збой пры ўсталёўцы паролю для рэзервовага капіявання"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Спыніць рэзервовае капіяванне пароляў ад Wi-Fi, закладак, іншых налад і дадзеных, а таксама выдаліць усе копіі на серверах Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Спыніць рэзервовае капіраванне пароляў ад Wi-Fi, закладак, іншых налад і дадзеных, а таксама выдаліць усе копіі на серверах Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налады адміністравання прылады"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Адміністратар прылады"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Адключыць"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Апавяшчэнні"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Мелодыя выкліка і вібрацыя"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Сістэма"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Налада Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Наладка Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Дадаць сетку"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Не падключана"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Дадаць сетку"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Падключэнне..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Перайсці да наступнага кроку"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP не падтрымліваецца."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Немагчыма наладзіць злучэнне EAP Wi-Fi падчас усталявння. Пазней вы можаце зрабіць гэта ў наладах у раздзеле \"Бесправадныя і правадныя сеткі\"."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Немагчыма наладзіць злучэнне EAP Wi-Fi падчас усталявння. Пазней вы можаце зрабіць гэта ў наладах у раздзеле \"Бесправадныя і правадныя сеткі\"."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Падлучэнне можа заняць некалькі хвілін..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Націсніце кнопку "<b>"\"Далей\""</b>", каб працягнуць усталёўку."\n\n"Націсніце кнопку "<b>"\"Назад\""</b>", каб падключыцца да іншай сеткі Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Націсніце кнопку "<b>"\"Далей\""</b>", каб працягнуць усталёўку."\n\n"Націсніце кнопку "<b>"\"Назад\""</b>", каб падключыцца да іншай сеткі Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Сінхранізацыя ўкл."</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Сінхранізацыя адключаная"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Памылка сінхранізацыі"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Адладжанае прыкладанне чакае далучэння да iнструмента для адладкi перад працай"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Увод"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Чарцёж"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Апаратнае паскарэнне рэндэрынгу"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Маніторынг"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Уключаны строгі рэжым"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Міг. экр., калі пр.. вык. працяг. апер. ў асн. пат."</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Ад лепшага да горшага: сіні, зялёны, светла-чырвоны, чырвоны"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Уключыць сляды"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Вылучыць укл. сляды"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Зараз ніякія сляды не ўключаны"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Зараз уключана наступная колькасць слядоў: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Зараз усе сляды ўключаны"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Уключэнне слядоў OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Паказаць межы размяшчэння"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Паказаць межы кліпу, палі і г. д."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Прымусовае выкарыстанне GPU для 2-мерных чарцяжоў"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Прымусовае выкананне 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Уключыць 4x MSAA у прыкладаннях з OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Адладка аперацый непрамавугольнага кліпа"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Апрацоўка профілю GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Вымерыць час рэндэрынгу ў абалонцы adb dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Маштаб анімацыі акна"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Маштаб перадачы анімацыі"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Шкала працягласці анiматара"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Ліміт фонавага працэсу"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Паказаць усе ANRS"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Паказаць дыялогавае акно \"Праграма не адказвае\" для фонавых прыкладанняў"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Выкарыстоўваць эксперыментальны WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Прыкладанні будуць выкарыстоўваць найноўшы (бэта-версія) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Выкарыстанне дадзеных"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цыкл выкарыст. дадзеных"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роўмінг дадзеных"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Абмежаваць фонавыя дадзеныя"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Незалежнае выкарыстанне 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Паказаць выкарыстанне Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Паказаць выкарыстанне Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Паказаць выкарыстанне Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Мабільныя гарачыя кропкі"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Аўтаматычная сiнхранiзацыя дадзеных"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Усталяваць ліміт маб. дадзеных"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Усталяваць ліміт дадзеных 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Усталяваць ліміт дадзеных 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Усталяваць ліміт дазеных Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Усталяваць ліміт дадзеных Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мабільныя"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ваша падключэнне для перадачы дадзеных будзе завершана пасля дасягнення пэўнага лiмiту."\n\n"Паколькi выкарыстанне дадзеных вызначаецца вашым планшэтам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ваша падключэнне для перадачы дадзеных "\n" будзе завершана пасля дасягнення пэўнага лiмiту."\n"{2/}Паколькi выкарыстанне дадзеных вызначаецца вашым тэлефонам i ваш аператар можа спаганяць плату iншым чынам, старайцеся прытрымлiвацца лiмiту."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Абмежаваць зыходныя дадзеныя?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Калі абмежаваць фонавую перадачу мабiльных дадзеных, некаторыя прыкладанні і службы не будуць працаваць пры падключэннi да сеткі Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага планшэта."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага тэлефона."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Калі абмежаваць фонавую перадачу мабiльных дадзеных, некаторыя прыкладанні і службы не будуць працаваць пры падключэннi да сеткі Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага планшэта."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Калі абмежаваць фонавую перадачу мабільных дадзеных, некаторыя прыкладанні і паслугі не будуць працаваць, калі вы падключаны да сеткi Wi-Fi сеткі."\n\n"Гэты параметр распаўсюджваецца на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g> "</font>\n<font size="12">"папярэджанне "</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ліміт"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Выдаленыя прыкладанні"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : выкарыстоўваецца прыкладна <xliff:g id="TOTAL">%1$s</xliff:g>, як вызначана на планшэце. Плата за выкарыстанне дадзеных у вашага аператара можа адрознiвацца."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : выкарыстоўваецца прыкладна <xliff:g id="TOTAL">%1$s</xliff:g>, як вызначана на тэлефоне. Плата за выкарыстанне дадзеных у вашага аператара можа адрознiвацца."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Мабільныя гарачыя кропкі"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Выберыце сеткі Wi-Fi, якія з\'яўляюцца мабільнымі гарачымі кропкамі. Можна забараніць прыкладанням выкарыстоўваць гэтыя сеткі ў фонавым рэжыме. Прыкладанні таксама могуць папярэджваць, перш чым выкарыстоўваць гэтыя сеткі для вялікіх спамповак."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Выберыце сеткі Wi-Fi, якія з\'яўляюцца мабільнымі гарачымі кропкамі. Можна забараніць прыкладанням выкарыстоўваць гэтыя сеткі ў фонавым рэжыме. Прыкладанні таксама могуць папярэджваць, перш чым выкарыстоўваць гэтыя сеткі для вялікіх спамповак."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мабільныя сеткі"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Сеткі Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Каб выбраць мабільныя гарачыя кропкі, уключыце Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Сеткi Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Каб выбраць мабільныя гарачыя кропкі, уключыце Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Экстраны выклік"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вярнуцца да выкліку"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назва"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Дазвол"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Забеспячэнне"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Карыстальнікі"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Вы"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Iншыя карыстальнікi"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Дадаць карыстальніка"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Актыўны"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактыўна"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Карыстальнікi і профілi"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Дадаць карыстальніка або профіль"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Абмежаваны профiль"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Перш чым вы зможаце стварыць профіль, у якiм будуць абмежаваннi, вам трэба наладзіць блакiроўку экрана для абароны сваiх прыкладанняў і персанальных дадзеных."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Усталёўка блакiроўкi"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не наладжана"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не наладжаны: абмежаваны профіль"</string>
     <string name="user_owner" msgid="3879126011135546571">"Уладальнік"</string>
+    <string name="user_you" msgid="1639158809315025986">"Вы (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псеўданім"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Дадаць"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Карыстальнікі маюць свае ўласныя прыкладанні і змесцiва"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Вы можаце абмяжоўваць доступ да прыкладанняў і змесціва са свайго ўліковага запісу"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Карыстальнік"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Абмежаваны профiль"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Дад. новага карыстальніка"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Вы можаце адкрыць доступ да гэтай прылады іншым людзям шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць уласныя прыкладанні, шпалеры і гэтак далей. Карыстальнікі таксама могуць наладжваць параметры планшэта, напрыклад Wi-Fi, якія ўплываюць на ўсіх."\n\n"Пасля стварэння новага карыстальніка, ён павінен прайсці праз працэс усталёўкі."\n\n"Любы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Вы можаце адкрыць доступ да гэтай прылады іншым карыстальнiкам шляхам стварэння дадатковых карыстальнікаў. Кожны карыстальнік мае свой уласны раздзел, на якім ён можа наладзіць уласныя прыкладанні, шпалеры і гэтак далей. Карыстальнікі таксама могуць наладжваць параметры планшэта, напрыклад Wi-Fi, якія ўплываюць на ўсіх."\n\n"Пасля стварэння новага карыстальніка, ён павінен прайсці праз працэс усталёўкі."\n\n"Любы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Пасля стварэння новага карыстальніка ён павінен прайсці праз працэс усталёўкі."\n\n"Любы карыстальнік можа прымаць абноўленыя дазволы на прыкладанне ад імён усіх іншых карыстальнікаў."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Наладзiць карыстальнiкаў?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Пераканайцеся, што чалавек мае магчымасць узяць планшэт i паднесцi яго да твару"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Наладзiць профiль?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Усталяваць"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не цяпер"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Толькі ўладальнік планшэта можа кіраваць звесткамi пра карыстальнікаў."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Толькі ўладальнік тэлефона можа кіраваць звесткамi пра карыстальнікаў."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Уладальнiкi профіляў з абмежаваннямi не могуць дадаваць уліковыя запісы"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Выдаліць <xliff:g id="USER_NAME">%1$s</xliff:g> з гэтай прылады"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новы карыстальнік"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Новы профiль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Выдаляеце сябе?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Выдаліць карыстальніка?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Выдаліць профiль?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Гэта прастора і дадзеныя будуць выдалены з гэтага планшэта. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Гэта прастора і дадзеныя будуць выдалены з гэтага тэлефона. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Гэта прастора карыстальніка і дадзеныя будуць выдалены з гэтага планшэта. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Гэта прастора карыстальніка і дадзеныя будуць выдалены з гэтага тэлефона. Немагчыма адмяніць гэта дзеянне."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Гэта прастора профiлю і дадзеныя будуць выдалены з гэтага планшэта. Немагчыма адмяніць гэта дзеянне."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Гэта прастора профiлю і дадзеныя будуць выдалены з гэтага тэлефона. Немагчыма адмяніць гэта дзеянне."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Даданне новага карыстальніка..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Выдалiць карыстальніка"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Выдаліць"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Разгарнуць параметры прыкладання"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага планшэта."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Гэты параметр распаўсюджвае на ўсіх карыстальнікаў гэтага тэлефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змяніць мову"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Мабільнае вяшчанне"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберыце тыпы надзвычайных папярэджанняў для адлюстравання."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Абмежаванні па прыкладаннi і змесціву"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРАЙМЕНАВАЦЬ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Усталяваць межы прыкладання"</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">"Гэта прыкладанне не падтрымліваецца ў профілях з абмежаваннямi"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Гэтае прыкладанне можа атрымліваць доступ да вашых уліковых запісаў"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Сеткі Wi-Fi і мабільныя сеткі"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дазволіць змяненне параметраў сетак Wi-Fi і мабільных сетак"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дазволіць змяненне спалучэнняў і параметраў Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дазволіць абмен дадзенымі, калі тэлефон дакранаецца да іншай прылады"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Доступ да інфармацыі аб месцазнаходжанні"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Дазволіць прыкладанню выкарыстоўваць вашу інфармацыю аб месцазнаходжанні"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Далей"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Завершыць"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Зрабіць фота"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Выберыце фатаграфію з галерэі"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index f203510..10d6f2a 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Бавна"</item>
     <item msgid="1145554631248513562">"Нормална"</item>
     <item msgid="7553665153391107454">"Бърза"</item>
-    <item msgid="2538100882620724753">"Много бърза"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"ПАРОЛА"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Нищо"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Неизвестен"</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">"Вътрешно хранилище на устройство"</item>
     <item msgid="3738430123799803530">"SD карта, която може да се премахва"</item>
     <item msgid="4498124044785815005">"Нека системата да реши"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Местоположение"</item>
+    <item msgid="255608127647030286">"Лични"</item>
+    <item msgid="4588829735729884491">"Съобщения"</item>
+    <item msgid="8971765125227378270">"Устройство"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"местоположение с ниска точност"</item>
+    <item msgid="5789673140227507995">"местоположение с висока точност"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"вибриране"</item>
+    <item msgid="3434165993711230924">"четене на контактите"</item>
+    <item msgid="616161687718081936">"промяна на контактите"</item>
+    <item msgid="7638002295329050091">"четене на списъка с обажданията"</item>
+    <item msgid="6546959730920410907">"промяна на списъка с обажданията"</item>
+    <item msgid="446877710771379667">"четене на календара"</item>
+    <item msgid="7674458294386319722">"промяна на календара"</item>
+    <item msgid="8281201165558093009">"сканиране за Wi-Fi"</item>
+    <item msgid="8694611243479480497">"известие"</item>
+    <item msgid="7776439107987345446">"сканиране за сигнал"</item>
+    <item msgid="514615766544675057">"обаждане по телефона"</item>
+    <item msgid="8181415497109310680">"четене на SMS"</item>
+    <item msgid="6816551144382117307">"запис на SMS"</item>
+    <item msgid="4600463921908905030">"получаване на SMS"</item>
+    <item msgid="5958926493289432745">"получаване на спешен SMS"</item>
+    <item msgid="4945269495221089540">"получаване на MMS"</item>
+    <item msgid="5570472453573929087">"получаване на насочено WAP съобщение"</item>
+    <item msgid="7125408150230860501">"изпращане на SMS"</item>
+    <item msgid="7080337936612188061">"четене на ICC SMS"</item>
+    <item msgid="587124103118495063">"запис на ICC SMS"</item>
+    <item msgid="2320577158869025503">"промяна на настройките"</item>
+    <item msgid="1545733463471924009">"рисуване върху елемент"</item>
+    <item msgid="3609046903962454582">"достъп до известията"</item>
+    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="1097324338692486211">"запис на звук"</item>
+    <item msgid="5031552983987798163">"възпроизвеждане на звук"</item>
+    <item msgid="8374996688066472414">"четене на буферната памет"</item>
+    <item msgid="3045529469061083747">"промяна на буферната памет"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Местоположение"</item>
+    <item msgid="8677040780775113033">"Местоположение"</item>
+    <item msgid="1660743989948992916">"Местоположение"</item>
+    <item msgid="8791172739860195290">"Вибриране"</item>
+    <item msgid="383413555642128046">"Четене на контактите"</item>
+    <item msgid="3654594895269697313">"Промяна на контактите"</item>
+    <item msgid="7928393476362362538">"Четене на списъка с обажданията"</item>
+    <item msgid="6248591205254641116">"Промяна на списъка с обажданията"</item>
+    <item msgid="6093344633066170692">"Четене на календара"</item>
+    <item msgid="1334886368750347692">"Промяна на календара"</item>
+    <item msgid="1638204101698708656">"Местоположение"</item>
+    <item msgid="2154671955760380322">"Публикуване на известие"</item>
+    <item msgid="4282477730595931828">"Местоположение"</item>
+    <item msgid="4891423912898525905">"Обаждане по телефона"</item>
+    <item msgid="626463821668200388">"Получаване на SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Изпращане на SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Получаване на SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Получаване на SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Получаване на SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Получаване на SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Изпращане на SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Получаване на SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Изпращане на SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Промяна на настройките"</item>
+    <item msgid="736541391767350377">"Рисуване върху елемент"</item>
+    <item msgid="5530815681721654194">"Достъп до известията"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Запис на звук"</item>
+    <item msgid="3493046322001257041">"Възпроизвеждане на звук"</item>
+    <item msgid="136815868796597058">"Четене на буферната памет"</item>
+    <item msgid="5238692940326972503">"Промяна на буферната памет"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средно"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Графика)"</item>
     <item msgid="1340692776955662664">"Извикване на стека при glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"На екрана като чертички"</item>
+    <item msgid="8272260411216018353">"На екрана като линии"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартно ограничение"</item>
     <item msgid="4071574792028999443">"Няма процеси на заден план"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 312bceb..7b0fe3b 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Самолетен режим"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Още…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Кабелни и безжични мрежи"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Управлява Wi-Fi, Bluetooth, самолетен режим, мобилни и VPN мрежи"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Управлява Wi‑Fi, Bluetooth, самолетен режим, мобилни и VPN мрежи"</string>
     <string name="roaming" msgid="3596055926335478572">"Роуминг на данни"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Свързване с услуги за данни при роуминг"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Свързване с услуги за данни при роуминг"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Въведете текст за показване на заключения екран"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Информация за потребителя върху заключен екран"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Данни за потребителя"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показв. на инф. за потр. профил върху закл. екран"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Инф. за потр. профил"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Достъп до местоположение"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Сигурност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Администриране на устройство"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Администратори на устройството"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Преглед или деактивиране на администраторите на устройството"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Достъп до известията"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включване на Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомняне на настройки"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Безжичен дисплей"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"За да видите устройства, включете безжичния дисплей."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Безжичният дисплей е деактивиран, защото Wi-Fi е изключен."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Безжичният дисплей е деактивиран, защото Wi‑Fi е изключен."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Търсене на дисплеи"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Търси се…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Няма намерени безжични дисплеи в района."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Когато тази функция е включена, можете да излъчвате съдържание от приложенията до друго устройство с поддръжка за КБП, като държите устройствата близо едно до друго. Например можете да излъчвате страници от Браузър, видеоклипове от 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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включване на Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Настройки за Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Включване на Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Настройки за Wi‑Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Задаване и управление на безжични точки за достъп"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Избиране на Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi се включва..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi се изключва…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Избиране на Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi‑Fi се включва…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Wi‑Fi се изключва…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Грешка"</string>
     <string name="wifi_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="3038290727701553612">"Известие при налична отворена мрежа"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Да се избягват лоши връзки"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Да не се използва Wi-Fi мрежа, освен ако няма добра връзка с интернет"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"С включен Wi-Fi при спящ режим"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Да не се използва Wi‑Fi мрежа, освен ако няма добра връзка с интернет"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканирането е винаги налице"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Услугата за местоположения на Google и другите приложения да сканират за мрежи дори когато Wi-Fi е изключен"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталиране на сертификати"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"За подобряване на точността на местоположението и за други цели Google и останалите приложения може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &amp;gt „Сканирането винаги да е налице“."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложенията може да сканират за мрежи в района дори когато Wi-Fi е изключен. Ако не искате това да се случва, отворете „Разширени“ &gt; „Сканирането винаги да е налице“."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Да не се показва отново"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"С включен Wi‑Fi при спящ режим"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Възникна проблем при промяна на настройката"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi да се оптимизира"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Намаляване на използването на батерията, когато Wi-Fi е включен"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi да се оптимизира"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Намаляване на използването на батерията, когато Wi‑Fi е включен"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавяне на мрежа"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мрежи"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi мрежи"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Бутон за WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Още опции"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Въвеждане на WPS ПИН"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Свързване с мрежа"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Забравяне на мрежа"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Промяна на мрежа"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Включете Wi-Fi, за да видите наличните мрежи."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Търсят се Wi-Fi мрежи…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Включете Wi‑Fi, за да видите наличните мрежи."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Търсят се Wi‑Fi мрежи…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Нямате разрешение да променяте Wi‑Fi мрежата."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Още"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авт. настройка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"За да завърши настройката, таблетът ви се нуждае от достъп до Wi-Fi. След това можете да превключвате между мобилни данни и Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"За да завърши настройката, таблетът ви се нуждае от достъп до Wi‑Fi. След това можете да превключвате между мобилни данни и Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показване на разширените опции"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Защитена настройка на Wi-Fi"</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="7204827509934892103">"Натиснете бутона за защитена настройка на Wi-Fi на маршрутизатора си. Той може да е с името „WPS“ или да съдържа този символ:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Въведете ПИН кода <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизатора си за Wi-Fi. Завършването на настройката може да отнеме до две минути."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Натиснете бутона за защитена настройка на 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="5754399645462924103">"Установена е връзка с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Свързахте се с Wi‑Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Настройката на WPS вече е в ход и завършването й може да отнеме до две минути"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Стартирането на WPS не бе успешно. Моля, опитайте отново след няколко минути."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Защитната настройка (WEP) на безжичния маршрутизатор не се поддържа"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Неуспешно удостоверяване. Моля, опитайте отново."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Бе открита друга сесия с WPS. Моля, опитайте отново след няколко минути."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID на мрежа"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Въведете SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Сигурност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила на сигнала"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Състояние"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Отказ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Свързване"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Забравяне"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Без пропускане"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора."\n\n"Настройката на таблета може да изисква значителна активност на мрежата."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Предупреждение: Това може да доведе до допълнителни таксувания за данни от оператора."\n\n"Настройката на телефона може да изисква значителна активност на мрежата."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ПРЕДУПРЕЖДЕНИЕ: Таблетът няма да може да потвърди, че софтуерът ви е актуален."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ПРЕДУПРЕЖДЕНИЕ: Телефонът няма да може да потвърди, че софтуерът ви е актуален."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Таблетът не можа да се свърже с тази Wi-Fi мрежа."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Телефонът не можа да се свърже с тази Wi-Fi мрежа."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Разширени настройки за Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Честотен спектър за Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ПРЕДУПРЕЖДЕНИЕ: Докато нямате връзка с интернет, таблетът няма да може да потвърди, че софтуерът ви е актуален."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ПРЕДУПРЕЖДЕНИЕ: Докато нямате връзка с интернет, телефонът няма да може да потвърди, че софтуерът ви е актуален."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблетът не можа да се свърже с тази Wi‑Fi мрежа."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефонът не можа да се свърже с тази Wi‑Fi мрежа."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Разширени настройки за Wi‑Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Честотен спектър за Wi‑Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Посочете обхвата от честота на работа"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Възникна проблем при задаването на честотния спектър."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адрес"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дължина на мрежов префикс"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Информация за устройството"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомняне на тази връзка"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Търсене на устройства"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Да се забрави ли тази група?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима точка за достъп през Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносима точка за достъп до Wi‑Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Точката за достъп се включва…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Точката за достъп се изключва…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Активна преносима точка за достъп до <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка на преносимата точката за достъп до Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Настройка на точката за достъп до Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Грешка на преносимата точка за достъп до Wi‑Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка на точката за достъп до Wi‑Fi"</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="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Сила на сигнала"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Роуминг"</string>
     <string name="status_operator" msgid="2274875196954742087">"Мрежа"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC адрес на Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC адрес за Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес на Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Сериен номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Няма данни"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Името на точката за достъп (APN) е активирано"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Името на точката за достъп (APN) е деактивирано"</string>
     <string name="bearer" msgid="594270280031923558">"Носител"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Тип MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Стойност на MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Изтриване на името на точката за достъп (APN)"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ново име на точка за достъп (APN)"</string>
     <string name="menu_save" msgid="8109345640668285399">"Запазване"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помощ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилни мрежи"</string>
     <string name="location_title" msgid="1029961368397484576">"Моето местоположение"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Mестоп. от Wi-Fi и моб. мрежа"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Mестоп. от Wi‑Fi и моб. мрежа"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположението се определя чрез Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Местоположението се определя чрез Wi‑Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Спътници на GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Приложенията да използват GPS на таблета ви, за да посочат местоположението ви"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Приложенията да използват GPS на телефона ви, за да посочат местоположението ви"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Филтриране"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор на филтриращи опции"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Всички"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Деактивирани"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Изтеглени"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Работещи"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB хранилище"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ако деактивирате вградено приложение, е възможно други приложения да не работят правилно. Данните ви също ще бъдат изтрити."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Да се изключат ли известията?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако изключите известията за това приложение, може да пропуснете важни сигнали и актуализации."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Операции на приложението"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Изпълнява се"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Никога не е използвано)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Употреба на хранилището"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Преглед на хранилището, използвано от приложения"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Течащи услуги:"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Дума:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Пряк път:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Език:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Напишете дума"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Незадължителен пряк път"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Редактиране на дума"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Редактиране"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Изтриване"</string>
@@ -1260,16 +1290,19 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Настройки за физическа клавиатура"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Опции на програмиста"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Задаване на опции за програмиране на приложения"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Опциите за програмисти не са налице за този потребител"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отстраняване на грешки през USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим за отстраняване на грешки, когато е свързано USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Отмяна на упълномощаванията за отстраняване на грешки през USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Сигнали за програмни грешки в менюто за захранване"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Включване на опцията за получаване на сигнал за програмна грешка в менюто за захранване"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Да остане активен"</string>
-    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма е в спящ режим при зареждане"</string>
+    <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Да се разрешат ли настройките за програмиране?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Тези настройки са предназначени само за програмиране. Те могат да доведат до прекъсване на работата или неправилно функциониране на устройството ви и приложенията в него."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Прилож. да се потвържд. през USB"</string>
@@ -1301,7 +1334,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Настройки за достъпност"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Услуги"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Система"</string>
-    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жестове за нивото на мащаба"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Жестове за увеличение"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Когато тази функция е включена, можете да увеличите или намалите мащаба, като докоснете екрана три пъти."\n\n"При увеличен мащаб можете:"\n<ul><li>"Да извършите панорамно преместване: Плъзнете два или повече пръста по екрана."</li>\n<li>"Да коригирате нивото на мащаба: Съберете заедно или разгънете два или повече пръста."</li></ul>\n\n"Можете също временно да промените мащаба на това, което е под пръста ви, като докоснете три пъти и задържите. В това променено състояние можете да плъзнете пръста си, за да изследвате различни части на екрана. Вдигнете го, за да се върнете към предишното състояние."\n\n"Забележка: Докосването три пъти за промяна на мащаба работи навсякъде освен при клавиатурата и навигационната лента."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Пряк път към ф-ята за достъпност"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Включено"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Край на обажд.: Бутон за захранване"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговаряне на паролите"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Забавяне при докосване и задържане"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Достъпност в мрежата: Подобряване"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Вкл."</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Изкл."</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Разрешено"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Не е разрешено"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Разрешаване"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Без разрешаване"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Да се използва ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> може да събира целия въвеждан от вас текст с изключение на паролите. Това включва лични данни, като номера на кредитни карти. Услугата може също така да събира данни за взаимодействията ви с таблета."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> може да събира целия въвеждан от вас текст с изключение на паролите. Това включва лични данни, като номера на кредитни карти. Услугата може също така да събира данни за взаимодействията ви с телефона."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Да се спре ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Докосването на „ОК“ ще спре <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Наблюдение на действията ви"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Получаване на известия, когато взаимодействате с приложение."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Да се спре ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"С докосването на „OK“ ще спрете <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма инсталирани услуги"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Трябва ли ви екранен четец?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack осигурява устна обратна връзка, за да помогне на потребители с увредено и намалено зрение. Искате ли да го инсталирате безплатно от Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Искате ли приложенията да инсталират скриптове от Google, които правят съдържанието им в мрежата по-достъпно?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Няма описание."</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерия"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Зарежда се"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Включен екран"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"Включен GPS"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Събуждане"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сигнал на мобилна мрежа"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Активно време на устройство"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Време за включен Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Време за включен Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Време на включен Wi‑Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Време на включен Wi‑Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> –  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Подробности от историята"</string>
     <string name="details_title" msgid="3792801565213935385">"Подробности за употребата"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Настройване на захранването"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Включени пакети"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"В режим на готовност"</string>
     <string name="power_phone" msgid="5392641106474567277">"Гласови обаждания"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор, на преден план"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Оставяне в будно състояние"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Работещ Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Работещ Wi‑Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Таблет"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Изпратени данни"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Информация за приложението"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Настройки за приложения"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Настройки на екрана"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Настройки за Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Настройки за Wi‑Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Настройки за Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Батерия, използвана от гласови обаждания"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Използвана при неактивен таблет батерия"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Превключете на самолетен режим, за да пестите захранване в области без покритие"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Батерия, използвана от дисплея и фоновото осветление"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Намалете яркостта на екрана и/или времето му за изчакване"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Батерия, използвана от Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Изключете Wi-Fi, когато не се използва или не е налице"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Батерия, използвана от Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Изключете Wi‑Fi, когато не се използва или не е налице"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Батерия, използвана от Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Изключете Bluetooth, когато не го използвате"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Опитайте да се свържете с различно устройство с Bluetooth"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриране"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Избор на друга машина"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Тази машина за синтезиране на реч може да събира всички изговорено от вас, включително лични данни като пароли и номера на кредитни карти. Тя произлиза от машината <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Искате ли да я активирате?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Този език изисква работеща връзка с мрежата за синтезирания говор."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Машини"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Настройки за <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> е активирано"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Предпочитана машина"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Общи"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контрол на захранването"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Актуализиране на настройките за Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Актуализиране на настройките за Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Актуализиране на настройките за Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"включено"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"изключено"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"включва се"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"изключва сe"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронизиране"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Премахване на всички сертификати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надеждни идент. данни"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показване на надеждни сертификати от сертифициращи органи"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Тип на хранилището"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"С хардуерна поддръжка"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтуерно"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертайте фигурата си за отключване"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Резервни копия и възстановяване"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични данни"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Създаване на резервно копие на данните ми"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Създаване на резервно копие в сървърите на Google на данните за приложенията, паролите за Wi-Fi и другите настройки"</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="auto_restore_title" msgid="5397528966329126506">"Автоматично възстановяване"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Новата парола не съответства на потвърждаването й"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Задаването на парола за резервно копие не бе успешно"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Да се спре ли създаването на резервни копия на вашите пароли за Wi-Fi, отметки, други настройки и данните за приложенията ви и да се изтрият всички копия от сървърите на Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Да се спре ли създаването на резервни копия на вашите пароли за Wi‑Fi, отметки, други настройки и данните за приложенията ви и да се изтрият всички копия от сървърите на Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Административни настройки на устройство"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор на устройство"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Деактивиране"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Известия"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Мелодия на обаждане и вибриране"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Система"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Настройка на Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Свържете се с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Свързвате се с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Свързахте се с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Настройка на Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Свържете се с Wi‑Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Свързвате се с Wi‑Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Свързахте се с Wi‑Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Добавяне на мрежа"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Няма връзка"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Добавяне на мрежа"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Свързва се..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Към следващата стъпка"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Не се поддържа EAP."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Не можете да конфигурирате Wi-Fi връзка с редактиране на точката за достъп (EAP) по време на настройката. След това можете да го направите от „Настройки“ &gt;  „Кабелни и безжични мрежи“."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Не можете да конфигурирате Wi‑Fi връзка с редактиране на точката за достъп (EAP) по време на настройката. След това можете да го направите от „Настройки“ &gt; „Кабелни и безжични мрежи“."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Свързването може да отнеме няколко минути..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Докоснете "<b>"Напред"</b>", за да продължите с настройката."\n\n"Докоснете "<b>"Назад"</b>", за да се свържете с друга Wi-Fi мрежа."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Докоснете "<b>"Напред"</b>", за да продължите с настройката."\n\n"Докоснете "<b>"Назад"</b>", за да се свържете с друга Wi‑Fi мрежа."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизирането е активирано"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизирането е деактивирано"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизирането."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Прил. изчаква инстр. за отстраняване на грешки да се прикачи преди изпълнение"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Въвеждане"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Начертаване"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Хардуерно ускорено изобразяване"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Наблюдение"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Строг режим: Активиран"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Примигване на екрана при дълги операции в главната нишка"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"От най-добро към най-лошо: синьо, зелено, светло червено, червено"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Хардуерни наслагвания: Деактив."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Трасирания: Активиране"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Избиране на акт. трасирания"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Понастоящем няма активирани трасирания"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Понастоящем са активирани <xliff:g id="NUM">%1$d</xliff:g> трасирания"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Понастоящем всички трасирания са активирани"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Трасирания на OpenGL: Акт."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Граници на оформлението"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показв. на границите на изрязване, полетата и др."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Принуд. използв. на GPU за двуизмерно начертаване"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Задаване на 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Активиране на 4x MSAA в прилож. с OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Отстраняване на грешки при неправоъгълно изрязване"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Профилиране на GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Измерване на времето за изобр. в adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Скала на аним.: Прозорец"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Скала на анимация: Преход"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скала за Animator"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Лимит за фонови процеси"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Всички нереагиращи прил."</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Диалог. прозорец „НП“ за приложения на заден план"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Експерим. WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Прил. ще ползват най-новата версия WebView (бета)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Използване на данни"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цикъл: Ползване на данни"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роуминг на данни"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Огран. на данните на заден план"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Отделно използване на 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ползване на Wi-Fi – показване"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Ползв. на Wi‑Fi да се показва"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Да се покаже употр. на Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Мобилни точки за достъп"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Автоматично синхронизиране на данни"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Лимит на мобилни данни: Задаване"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Задаване на лимит на 4G данните"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Лимит на 2G–3G данни: Задаване"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Лимит на Wi-Fi данни: Задаване"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Лимит за данни през Wi‑Fi: Задаване"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобилни"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от таблета ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилната ви връзка за данни ще бъде деактивирана при достигане на посочения лимит."\n\n"Тъй като използването им се измерва от телефона ви, а операторът ви може да го отчита по различен начин, помислете дали да не използвате умерен лимит."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Да се ограничат ли данните на заден план?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."\n\n"Настройката засяга всички потребители на този таблет."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi-Fi мрежа."\n\n"Настройката засяга всички потребители на този телефон."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа."\n\n"Настройката засяга всички потребители на този таблет."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ако ограничите мобилните данни на заден план, някои приложения и услуги няма да работят, освен ако не сте свързани с Wi‑Fi мрежа."\n\n"Настройката засяга всички потребители на този телефон."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"предупреждение"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ограничение"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Премахнати приложения"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: използвани около <xliff:g id="TOTAL">%1$s</xliff:g> по измерване от таблета. Операторът може да отчита данните различно."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: използвани около <xliff:g id="TOTAL">%1$s</xliff:g> по измерване от телефона. Операторът може да отчита данните различно."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Мобилни точки за достъп"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Изберете Wi-Fi мрежите, които са мобилни точки за достъп. Приложенията могат да бъдат ограничени от ползването им, когато са на заден план. Възможно е също да предупреждават, преди да използват тези мрежи за големи изтегляния."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Изберете Wi‑Fi мрежите, които са мобилни точки за достъп. Приложенията могат да бъдат ограничени от ползването им, когато са на заден план. Възможно е също да предупреждават, преди да използват тези мрежи за големи изтегляния."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилни мрежи"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi мрежи"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"За да изберете мобилни точки за достъп, включете Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi‑Fi мрежи"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"За да изберете мобилни точки за достъп, включете Wi‑Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Спешно обаждане"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад към обаждането"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Име"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Разрешаващо"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Налагане"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Потребители"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Вие"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Други потребители"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Потребител: Добавяне"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Активен"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивен"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Потребители и потребителски профили"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Добавяне на потр. или потр. профил"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничен потребителски профил"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Преди да можете да създадете потребителски профил с ограничена функционалност, трябва да настроите заключения екран, за да защитите приложенията и личните си данни."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Задаване на заключване"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не е настроен"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не е настроен – ограничен потребителски профил"</string>
     <string name="user_owner" msgid="3879126011135546571">"Собственик"</string>
+    <string name="user_you" msgid="1639158809315025986">"Вие (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Добавяне"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Потребителите имат свои собствени приложения и съдържание"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Можете да ограничите достъпа до приложенията и съдържанието от профила си"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Потребител"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничен потр. профил"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавяне на нов потребител"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира със свои собствени приложения, тапет и др. Те могат да коригират и настройки на таблета, като например Wi-Fi, които засягат всички."\n\n"След като създадете нов потребител, той трябва да премине през процеса за настройка."\n\n"Всеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Можете да споделите това устройство с други хора, като създадете допълнителни потребители. Всеки от тях има собствено работно пространство, което може да персонализира със свои собствени приложения, тапет и др. Те могат да коригират и настройки на таблета, като например Wi‑Fi, които засягат всички."\n\n"След като създадете нов потребител, той трябва да премине през процеса за настройка."\n\n"Всеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"След като създадете нов потребител, той трябва да премине през процеса за настройка."\n\n"Всеки потребител може да приема разрешения на актуализирани приложения от името на всички останали."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настройване на потребителя?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Уверете се, че човекът е налице да вземе таблета и да настрои работното си пространство"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ще настроите ли потребителския профил сега?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Настройване сега"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сега"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Само собственикът на таблета може да управлява потребителите."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Само собственикът на телефона може да управлява потребителите."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"В потребителските профили с ограничена функционалност не могат да се добавят профили"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Изтриване на <xliff:g id="USER_NAME">%1$s</xliff:g> от у-вото"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нов потребител"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Нов потребителски профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Искате ли да се изтриете?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Да се премахне ли?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Да се премахне ли потр. профил?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ще загубите работното си пространство и данните си на този таблет. Не можете да отмените това действие."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ще загубите работното си пространство и данните си на този телефон. Не можете да отмените това действие."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Работното пространство и данните на този потребител ще изчезнат от таблета. Не можете да отмените това действие."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Работното пространство и данните на този потребител ще изчезнат от телефона. Не можете да отмените това действие."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Работното пространство и данните на този потребителски профил ще изчезнат от таблета. Не можете да отмените това действие."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Работното пространство и данните на този потребителски профил ще изчезнат от телефона. Не можете да отмените това действие."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Новият потребител се добавя…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Изтриване на потребителя"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Изтриване"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Разрешаване на приложения и съдържание"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничения"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Настройки за прилож.: Разгъв."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройката засяга всички потребители на този таблет."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройката засяга всички потребители на този телефон."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промяна на езика"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Идент. № на снимката"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Клетъчни излъчвания"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изберете типовете спешни сигнали, които да се показват."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Прилож. и съдържание: Ограничения"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУВАНЕ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Огранич. за приложението: Задаване"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi и мобилни данни"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Разрешаване на промяна на настройките за Wi‑Fi и мобилни данни"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Разрешаване на промяна на сдвояванията и настройките на Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"КБП"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Разрешаване на обмен на данни, когато таблетът докосва друго устройство"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Разрешаване на обмен на данни, когато телефонът докосва друго устройство"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Достъп до местоположението"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Разрешаване на приложенията да използват информация за местоположението ви"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Напред"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Край"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Правене на снимка"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Избор на снимка от галерията"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index f7536ba..02cadad 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lenta"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Ràpida"</item>
-    <item msgid="2538100882620724753">"Molt ràpida"</item>
+    <item msgid="1370673569131070146">"Més ràpida"</item>
+    <item msgid="4648206845228970803">"Molt ràpida"</item>
+    <item msgid="4977949754169483251">"Ràpida"</item>
+    <item msgid="6106302964845503577">"Molt ràpida"</item>
+    <item msgid="6800277205640837264">"Màxima"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Molt baix"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Cap"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Cap"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"No especificat"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Cap"</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">"Emmagatzematge intern del dispositiu"</item>
     <item msgid="3738430123799803530">"Targeta SD extraïble"</item>
     <item msgid="4498124044785815005">"Deixa que ho decideixi el sistema"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Ubicació"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Missatgeria"</item>
+    <item msgid="8971765125227378270">"Dispositiu"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ubicació aproximada"</item>
+    <item msgid="5789673140227507995">"ubicació precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibració"</item>
+    <item msgid="3434165993711230924">"lectura de contactes"</item>
+    <item msgid="616161687718081936">"modifica els contactes"</item>
+    <item msgid="7638002295329050091">"llegeix el registre de trucades"</item>
+    <item msgid="6546959730920410907">"modifica el registre de trucades"</item>
+    <item msgid="446877710771379667">"lectura del calendari"</item>
+    <item msgid="7674458294386319722">"modifica el calendari"</item>
+    <item msgid="8281201165558093009">"exploració de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificació"</item>
+    <item msgid="7776439107987345446">"exploració de cel·la"</item>
+    <item msgid="514615766544675057">"trucada de telèfon"</item>
+    <item msgid="8181415497109310680">"llegeix SMS"</item>
+    <item msgid="6816551144382117307">"escriu SMS"</item>
+    <item msgid="4600463921908905030">"rep SMS"</item>
+    <item msgid="5958926493289432745">"rep SMS d\'emergència"</item>
+    <item msgid="4945269495221089540">"rep MMS"</item>
+    <item msgid="5570472453573929087">"rep insercions WAP"</item>
+    <item msgid="7125408150230860501">"envia SMS"</item>
+    <item msgid="7080337936612188061">"llegeix SMS ICC"</item>
+    <item msgid="587124103118495063">"escriu SMS ICC"</item>
+    <item msgid="2320577158869025503">"modifica la configuració"</item>
+    <item msgid="1545733463471924009">"dibuixa a sobre"</item>
+    <item msgid="3609046903962454582">"accedeix a les notificacions"</item>
+    <item msgid="4671646036128214513">"càmera"</item>
+    <item msgid="1097324338692486211">"enregistra l\'àudio"</item>
+    <item msgid="5031552983987798163">"reprodueix l\'àudio"</item>
+    <item msgid="8374996688066472414">"llegeix el porta-retalls"</item>
+    <item msgid="3045529469061083747">"modifica el porta-retalls"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ubicació"</item>
+    <item msgid="8677040780775113033">"Ubicació"</item>
+    <item msgid="1660743989948992916">"Ubicació"</item>
+    <item msgid="8791172739860195290">"Vibració"</item>
+    <item msgid="383413555642128046">"Lectura de contactes"</item>
+    <item msgid="3654594895269697313">"Modifica els contactes"</item>
+    <item msgid="7928393476362362538">"Llegeix el registre de trucades"</item>
+    <item msgid="6248591205254641116">"Modifica el registre de trucades"</item>
+    <item msgid="6093344633066170692">"Lectura del calendari"</item>
+    <item msgid="1334886368750347692">"Modifica el calendari"</item>
+    <item msgid="1638204101698708656">"Ubicació"</item>
+    <item msgid="2154671955760380322">"Notificació de la publicació"</item>
+    <item msgid="4282477730595931828">"Ubicació"</item>
+    <item msgid="4891423912898525905">"Trucada de telèfon"</item>
+    <item msgid="626463821668200388">"Rep SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Envia SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Rep SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Rep SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Rep SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Rep SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Envia SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Rep SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Envia SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifica la configuració"</item>
+    <item msgid="736541391767350377">"Dibuixa a sobre"</item>
+    <item msgid="5530815681721654194">"Accedeix a les notificacions"</item>
+    <item msgid="781213371706962767">"Càmera"</item>
+    <item msgid="1720492593061838172">"Enregistra l\'àudio"</item>
+    <item msgid="3493046322001257041">"Reprodueix l\'àudio"</item>
+    <item msgid="136815868796597058">"Llegeix el porta-retalls"</item>
+    <item msgid="5238692940326972503">"Modifica el porta-retalls"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curt"</item>
     <item msgid="2560532955514699713">"Mitjà"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (gràfics)"</item>
     <item msgid="1340692776955662664">"Pila de trucades de glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Desactivada"</item>
+    <item msgid="675719912558941285">"Pintar blava regió retall no rect."</item>
+    <item msgid="1064373276095698656">"Dest. ordres dibuix provad. en verd"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Desactivat"</item>
+    <item msgid="2751513398307949636">"A la pantalla com a barres"</item>
+    <item msgid="8272260411216018353">"A la pantalla com a línies"</item>
+    <item msgid="120512413928262547">"A adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límit estàndard"</item>
     <item msgid="4071574792028999443">"Sense processos en segon pla"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 3d4ac75..aec0374 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -23,11 +23,11 @@
     <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 ja 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 ja només et queden <xliff:g id="STEP_COUNT">%1$d</xliff:g> passos per convertir-te en desenvolupador."</item>
+    <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>
-    <string name="show_dev_on" msgid="1110711554982716293">"Ara ja ets un desenvolupador!"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"No cal, ja ets un desenvolupador."</string>
+    <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="4944823405420438623">"Connexions sense fil i xarxes"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIU"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Mode d\'avió"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Més..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Connexions sense fil i xarxes"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Gestiona la Wi-fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gestiona la Wi-Fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerància de dades"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Estableix connexió amb serveis de dades en itinerància"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Estableix connexió amb serveis de dades en itinerància"</string>
@@ -282,7 +282,7 @@
     <string name="sum_carrier_select" msgid="3616956422251879163">"Selecciona un operador de xarxa"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Data i hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Establiment de data i d\'hora"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Defineix la data, l\'hora, el fus horari i els formats"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Defineix la data, l\'hora, la zona horària i els formats"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Data i hora automàtiques"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utilitza l\'hora proporcionada per la xarxa"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utilitza l\'hora proporcionada per la xarxa"</string>
@@ -291,11 +291,11 @@
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utilitza la zona horària proporcionada per la xarxa"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Format de 24 hores"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Defineix l\'hora"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecciona el fus horari"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Selecciona la zona horària"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Defineix la data"</string>
     <string name="date_time_date_format" msgid="6951498879879281102">"Format de data"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Ordena alfabèticament"</string>
-    <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Ordena per fus horari"</string>
+    <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>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Escriu el text que vulguis mostrar a la pantalla de bloqueig"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info. de l\'usuari a la pantalla de bloqueig"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. de l\'usuari"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostra la inf. de perfil a la pantalla de bloqueig"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informació de perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Accés a la ubicació"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguretat"</string>
     <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>
@@ -316,12 +318,12 @@
     <string name="security_passwords_title" msgid="2930627259125138363">"Contrasenyes"</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">"Encriptació del telèfon"</string>
+    <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encripta el telèfon"</string>
     <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Sol·licita un PIN numèric o una contrasenya per desencriptar la tauleta cada vegada que s\'engegui"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Sol·licita un PIN numèric o una contrasenya per desencriptar el telèfon cada vegada que s\'engegui"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Quan encriptis la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis: no pots desencriptar-la tret que duguis a terme un restabliment de les dades de fàbrica, la qual cosa esborraria totes les teves dades."\n\n"L\'encriptació triga una hora o més. Cal que iniciïs el procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pots encriptar els teus comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptis el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis: no podràs desencriptar el telèfon tret que duguis a terme un restabliment de les dades de fàbrica, cosa que n\'esborrarà totes les dades."\n\n"L\'encriptació triga una hora o més. Cal que iniciïs el procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si interromps el procés d\'encriptació, perdràs totes les dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptada la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades)."\n\n"El procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptat el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades)."\n\n"El procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encripta la tauleta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encripta el telèfon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carrega la bateria i torna-ho a provar."</string>
@@ -340,7 +342,7 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades de la tauleta. "\n\n"Per reprendre l\'ús de la tauleta, cal que duguis a terme un restabliment de fàbrica. Quan configuris la tauleta després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"S\'ha interromput l\'encriptació i no es pot completar. A conseqüència d\'això, ja no es pot accedir a les dades del telèfon. "\n\n"Per reprendre l\'ús del telèfon, cal que duguis a terme un restabliment de fàbrica. Quan configuris el telèfon després del restabliment, tindràs l\'oportunitat de restaurar les dades de les quals s\'hagi fet una còpia de seguretat al teu compte de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Canvia el mètode d\'introducció"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria bloq. de pantalla"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria bloqueig de pantalla"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Tria bloq. còpia seg."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Bloqueig de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Canvi pantalla bloq."</string>
@@ -416,8 +418,17 @@
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Següent"</string>
     <string name="lock_setup" msgid="3355847066343753943">"S\'ha completat la configuració."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administració de dispositius"</string>
-    <string name="manage_device_admin" msgid="5059296715271077278">"Administradors de dispositiu"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Mostra o desactiva els administradors del dispositiu"</string>
+    <string name="manage_device_admin" msgid="5059296715271077278">"Administradors de dispositius"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Mostra o desactiva els administradors de dispositiu"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activa el Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Pantalla sense fil"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Per veure els dispositius, activa la pantalla sense fil."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"La pantalla sense fil està desactivada perquè la Wi-Fi està desactivada."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla sense fil està desactivada perquè la Wi-Fi està desactivada."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Cerca pantalles"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"S\'està cercant…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No s\'han trobat pant. sense fils a prop."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Si la funció Android Beam està activada, pots col·locar un dispositiu a prop d\'un altre compatible amb tecnologia NFC per compartir contingut d\'aplicacions. Per exemple, pots transferir pàgines del navegador, vídeos de YouTube, contactes i molt més."\n\n"Col·loca els dispositius a prop (generalment, l\'un d\'esquena a l\'altre) i, a continuació, toca la pantalla del teu dispositiu. L\'aplicació determina el contingut que es pot transferir."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detectabilitat del servei de xarxa"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permet que les aplicacions d\'altres dispositius descobreixin les aplicacions d\'aquest"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activa la Wi-fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Configuració de Wi-fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activa la Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Configuració de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura i gestiona els punts d\'accés sense fil"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Selecciona la Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"S\'està activant la Wi-Fi"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"S\'està desactivant la Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecciona la Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"S\'està activant la Wi-Fi..."</string>
+    <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="3038290727701553612">"Notifica\'m quan hi hagi una xarxa oberta disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions estables"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No utilitzis una xarxa Wi-Fi tret que tingui una connexió a Internet acceptable"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Usa Wi-Fi en repòs"</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_scan_always_available" msgid="3470564139944368030">"Cerca xarxes sempre"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Instal·la els certificats"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per millorar la precisió de la ubicació i per a altres finalitats, Google i altres aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les aplicacions poden cercar xarxes properes tot i que la Wi-Fi estigui desactivada. Si no vols que això passi, accedeix a Avançat &gt; Cerca xarxes sempre."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No m\'ho tornis a mostrar"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Utilitza la Wi-Fi en repòs"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"S\'ha produït un problema en canviar la configuració"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimització de la Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimitza l\'ús de la bateria amb Wi-Fi activada"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimització de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimitza l\'ús de la bateria amb Wi-Fi activada"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Afegeix una xarxa"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Xarxes Wi-fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Xarxes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botó de pulsació de WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Més opcions"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN de WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi directe"</string>
+    <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_connect" msgid="4996220309848349408">"Connecta\'t a la xarxa"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esborra la xarxa"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica la xarxa"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Per veure les xarxes disponibles, activa la Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"S\'estan cercant xarxes Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Per veure les xarxes disponibles, activa la Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"S\'estan cercant xarxes Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tens permís per canviar la xarxa Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Una altra xarxa…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Més"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automàtica (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Per completar la configuració, la tauleta necessita accés a la Wi-Fi. En acabat, podràs canviar entre les dades mòbils i la Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Per completar la configuració, la tauleta necessita accés a Wi-Fi. Quan hagi finalitzat, podràs canviar entre dades mòbils i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra les opcions avançades"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuració protegida de Wi-Fi"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ja s\'està executant i pot trigar fins a dos minuts a completar-se"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"S\'ha produït un error en iniciar WPS. Torna-ho a provar d\'aquí a una estona."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuració de seguretat de l\'encaminador sense fils (WEP) no és compatible"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Error d\'autenticació. Torna-ho a provar."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"S\'ha detectat una altra sessió de WPS. Torna-ho a provar d\'aquí a una estona."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de xarxa"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Introdueix el SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguretat"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensitat del senyal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Estat"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Vols permetre-ho per a totes les aplicacions que vulguin cercar xarxes?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denega"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connecta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esborra"</string>
@@ -612,16 +634,16 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"No ometis"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTIMENT: És possible que l\'operador de telefonia mòbil apliqui càrrecs addicionals."\n\n"La configuració de la tauleta pot necessitar una gran quantitat d\'activitat de xarxa."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTIMENT: És possible que l\'operador de telefonia mòbil apliqui càrrecs addicionals."\n\n"La configuració del telèfon pot necessitar una gran quantitat d\'activitat de xarxa."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTIMENT: La tauleta no podrà verificar que el programari estigui actualitzat."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTIMENT: El telèfon no podrà verificar que el programari estigui actualitzat."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"La tauleta no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El telèfon no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avançada"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de freqüència Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTIMENT: Fins que no tingueu una connexió a Internet, la tauleta no podrà verificar que el programari estigui actualitzat."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTIMENT: Fins que no tingueu una connexió a Internet, el telèfon no podrà verificar que el programari estigui actualitzat."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tauleta no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El telèfon no ha pogut connectar amb aquesta xarxa Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançada"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda de freqüència Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifica l\'interval de freqüència de funcionament"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"S\'ha produït un problema en definir la banda de freqüència."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adreça MAC"</string>
-    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"adreça IP"</string>
+    <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"Adreça IP"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configuració IP"</string>
     <string name="wifi_ip_settings_menu_save" msgid="7296724066102908366">"Desa"</string>
     <string name="wifi_ip_settings_menu_cancel" msgid="6582567330136502340">"Cancel·la"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passarel·la"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefix de xarxa"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informació del dispositiu"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recorda aquesta connexió"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cerca dispositius"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vols cancel·lar la invitació?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vols cancel·lar la invitació per connectar amb <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vols oblidar aquest grup?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portàtil"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portàtil"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"S\'està activant la zona Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"S\'està desactivant la zona Wi-Fi…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portàtil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configura la zona Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Zona Wi-Fi portàtil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> amb seguretat <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Error de zona Wi-Fi portàtil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura la zona Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
@@ -680,7 +702,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"So de bloqueig de pantalla"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar en tocar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Cancel·lació de sorolls"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"Música, vídeo, jocs i altres fitxers multimèdia"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"Música, vídeos, jocs i altres fitxers multimèdia"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"To i notificacions"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Notificacions"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Alarmes"</string>
@@ -784,14 +806,13 @@
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
     <string name="status_icc_id" msgid="943368755577172747">"ICCID"</string>
     <string name="status_network_type" msgid="3279383550222116235">"Tipus de xarxa mòbil"</string>
-    <!-- no translation found for status_latest_area_info (7222470836568238054) -->
-    <skip />
+    <string name="status_latest_area_info" msgid="7222470836568238054">"Informació de l\'operador"</string>
     <string name="status_data_state" msgid="5503181397066522950">"Estat de la xarxa mòbil"</string>
     <string name="status_service_state" msgid="2323931627519429503">"Estat del servei"</string>
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensitat del senyal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Itinerància"</string>
     <string name="status_operator" msgid="2274875196954742087">"Xarxa"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adreça MAC de Wi-fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adreça MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adreça de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de sèrie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
@@ -880,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activat"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN desactivat"</string>
     <string name="bearer" msgid="594270280031923558">"Titular"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipus de MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Suprimeix l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nou"</string>
     <string name="menu_save" msgid="8109345640668285399">"Desa"</string>
@@ -896,7 +919,7 @@
     <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, que inclou:"\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>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
@@ -912,7 +935,7 @@
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dibuixeu el perfil de desbloqueig"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Has de dibuixar el teu patró de desbloqueig per confirmar el restabliment de dades de fàbrica."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
-    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Vols restablir?"</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Restablir?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Esborra l\'emmagatzematge USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Esborra la targeta SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Esborra totes les dades de l\'emmagatzematge USB"</string>
@@ -956,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Xarxes mòbils"</string>
     <string name="location_title" msgid="1029961368397484576">"La meva ubicació"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Ubicació de xarxa mòbil i Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Ubicació p. Wi-Fi i xarxa mòb."</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="7457348712272184793">"Ubicació determinada per Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicació determinada per Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satèl·lits GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permet que les aplicacions utilitzin el GPS de la tauleta per determinar la teva ubicació"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Permet que les aplicacions utilitzin el GPS del telèfon per determinar la teva ubicació"</string>
@@ -967,8 +990,8 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilitza el servidor per ajudar al GPS (desmarqueu-ho per millorar el rendiment del GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Ubicació i cerca de Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permet a Google utilitzar la teva ubicació per millorar els resultats de cerca i altres serveis."</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Accedeix a la meva ubicació"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permet que les aplicacions que t\'hagin demanat permís utilitzin la informació sobre la teva ubicació"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Accés a la meva ubicació"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permet que les aplicacions que hagin demanat permís utilitzin la informació sobre la ubicació"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fonts d\'ubicació"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Quant a la tauleta"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Quant al telèfon"</string>
@@ -989,7 +1012,7 @@
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Trieu la contrasenya"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Tria el teu patró"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecció del PIN"</string>
-    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirmació de la contrasenya"</string>
+    <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"Confirma la teva contrasenya"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"Confirma el teu patró"</string>
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Confirmació del PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Les contrasenyes no coincideixen"</string>
@@ -1034,14 +1057,14 @@
     <string name="install_applications" msgid="4872012136210802181">"Orígens desconeguts"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Permet la instal·lació d\'aplicacions d\'origen desconegut"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"La tauleta i les dades personals són més vulnerables a l\'atac d\'aplicacions provinents de fonts desconegudes. Acceptes que ets l\'únic responsable de qualsevol dany que es produeixi a la teva tauleta o de la pèrdua de dades que pugui ocasionar la utilització d\'aquestes aplicacions."</string>
-    <string name="install_all_warning" product="default" msgid="8113734576826384682">"El telèfon i les dades personals són més vulnerables a atacs per part d\'aplicacions d\'orígens desconeguts. L\'usuari accepta ser l\'únic responsable de qualsevol dany al telèfon o de la pèrdua de dades que puguin resultar de l\'ús de les aplicacions"</string>
+    <string name="install_all_warning" product="default" msgid="8113734576826384682">"El telèfon i les dades personals són més vulnerables a atacs per part d\'aplicacions d\'orígens desconeguts. L\'usuari accepta ser l\'únic responsable de qualsevol dany que es produeixi al telèfon o de la pèrdua de dades que puguin resultar de l\'ús d\'aquestes aplicacions."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verifica les aplicacions"</string>
-    <string name="verify_applications_summary" msgid="6737505521913263792">"No donis permís per instal·lar aplicacions que puguin ser perjudicials o bé avisa abans de fer-ho"</string>
+    <string name="verify_applications_summary" msgid="6737505521913263792">"No permetis la instal·lació d\'aplicacions que puguin causar danys o bé mostra una advertència abans de fer-ho"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Configuració avançada"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Activa més opcions de configuració"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Informació de l\'aplicació"</string>
     <string name="storage_label" msgid="8700867073480107253">"Emmagatzematge"</string>
-    <string name="auto_launch_label" msgid="3012617472833815382">"Inicia de manera predeterminada"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"Obre de manera predeterminada"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Valors predeterminats"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Compatibilitat amb la pantalla"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Permisos"</string>
@@ -1083,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecció d\'opcions de filtre"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Totes"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desactivades"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Baixades"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En execució"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Emmagatzematge USB"</string>
@@ -1142,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Si desactives una aplicació incorporada, és possible que altres aplicacions no funcionin correctament. Les teves dades també se suprimiran."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vols desactivar les notificacions?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactives les notificacions d\'aquesta aplicació, pots perdre\'t actualitzacions i alertes importants."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Operacions d\'aplicacions"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"S\'està executant"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(No s\'ha utilitzat mai)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ús d\'emmagatzematge"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Mostra l\'emmagatzematge que utilitzen les aplicacions"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serveis en execució"</string>
@@ -1179,8 +1206,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Vols aturar el servei del sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si atures aquest servei, hi ha funcions de la tauleta que és possible que deixin de funcionar correctament fins que no l\'apaguis i la tornis a engegar."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si atures aquest servei, és possible que hi hagi funcions del telèfon que deixin de funcionar correctament fins que no l\'apaguis i el tornis a engegar."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Idioma i entrada de text"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i entrada de text"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma i introducció de text"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma i introducció de text"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Configuració d\'idioma"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclat i mètodes d\'entrada"</string>
     <string name="phone_language" msgid="8870144109924299673">"Idioma"</string>
@@ -1193,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuració del teclat físic"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premeu la tecla d\'espai dos cops per inserir \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Mostra les contrasenyes"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el text que escrius, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Vols utilitzar aquest mètode d\'entrada?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Pot ser que aquest mètode d\'entrada pugui recopilar tot el que escriviu, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Voleu utilitzar aquest mètode d\'entrada?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"És possible que aquest corrector ortogràfic pugui recopilar tot el text que escrius, la qual cosa inclou dades personals com ara les contrasenyes i els números de les targetes de crèdit. Prové de l\'aplicació <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vols fer servir aquest corrector ortogràfic?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuració"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
@@ -1221,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Paraula:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Drecera:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Escriu una paraula"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Drecera opcional"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edició de la paraula"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edita"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Suprimeix"</string>
@@ -1242,8 +1271,8 @@
     <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">"Entrada de text"</string>
-    <string name="input_method" msgid="5434026103176856164">"Mètode d\'entrada"</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="234072873286056438">"Predeterminat"</string>
     <string name="input_method_selector" msgid="4311213129681430709">"Selector del mètode d\'entrada"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automàtic"</string>
@@ -1261,24 +1290,27 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configuració del teclat físic"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opcions del desenvolupador"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Defineix les opcions per al desenvolupament d\'aplicacions"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Les opcions per a desenvolupadors no estan disponibles per a aquest usuari."</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuració USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Activa el mode de depuració quan el dispositiu estigui connectat per USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autoritzacions depuració USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Informe d\'error al menú"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou l\'opció de fer un informe d\'error al menú d\'encesa"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"Mantén-te activat"</string>
+    <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permet les ubicacions simulades"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</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\'equip i el dispositiu, per instal·lar aplicacions al dispositiu sense rebre notificacions i per llegir dades de registre."</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vols permetre la conf. de desenvolupament?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Aquesta configuració només està prevista per a usos de desenvolupament. Pot fer que el dispositiu i que les aplicacions s\'interrompin o tinguin un comportament inadequat."</string>
-    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificació d\'aplicació per USB"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprova les aplicacions que s\'hagin instal·lat mitjançant ADB/ADT per veure si tenen un comportament perillós."</string>
+    <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifica aplicacions per USB"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprova les aplicacions que s\'hagin instal·lat mitjançant ADB/ADT per detectar possibles comportaments perillosos."</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Protegeix emmagatzematge USB"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les aplicacions han de sol·licitar permís per llegir l\'emmagatz. USB"</string>
-    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vols protegir l\'emmagatz. USB?"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Si l\'emmagatzematge USB està protegit, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Les aplicacions han de sol·licitar permís per llegir l\'emmagatzematge USB"</string>
+    <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Vols protegir l\'emmagatzematge USB?"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"Quan l\'emmagatzematge USB està protegit, les aplicacions han de sol·licitar permís per llegir les dades de l\'emmagatzematge extern."\n\n"És possible que algunes aplicacions no funcionin fins que els desenvolupadors no les actualitzin."</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"Protecció de la targeta SD"</string>
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Les aplicacions han de sol·licitar permís per llegir la targeta SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Vols protegir la targeta SD?"</string>
@@ -1315,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"El botó d\'engegada penja"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Digues contrasenyes"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retard toca i mantén premut"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Millora l\'accessibilitat web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuració"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivada"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permeses"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No es permet"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permet"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"No permetis"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Vols fer servir <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pot recopilar tot el text que escrius, excepte les contrasenyes. Això inclou les dades personals com ara els números de targetes de crèdit. També pot recopilar dades sobre les teves interaccions amb la tauleta."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pot recopilar tot el text que escrius, excepte les contrasenyes. Això inclou les dades personals com ara els números de targetes de crèdit. També pot recopilar dades sobre les teves interaccions amb el telèfon."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Vols aturar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Si toques D\'acord, s\'aturarà <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivat"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar les teves accions"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Rep notificacions quan interaccionis amb una aplicació."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Vols aturar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Si toques D\'acord, s\'aturarà <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No hi ha cap servei instal·lat"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessites un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack proporciona comentaris per veu per ajudar usuaris invidents i amb visió disminuïda. Vols instal·lar-lo de manera gratuïta des d\'Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vols que les aplicacions instal·lin scripts de Google per millorar l\'accessibilitat del seu contingut?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No s\'ha proporcionat cap descripció."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuració"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
@@ -1345,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"S\'està carregant"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla activada"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activat"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Despert"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Senyal de xarxa mòbil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Temps d\'activació del dispositiu"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi a temps"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi a temps"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a temps"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a temps"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalls de l\'historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalls d\'ús"</string>
@@ -1360,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Redueix l\'ús de la bateria"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquets inclosos"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Dispositiu inactiu"</string>
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
@@ -1370,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer pla de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Actiu"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en marxa"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi en execució"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tauleta"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telèfon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dades enviades"</string>
@@ -1383,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informació de l\'aplicació"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuració de l\'aplicació"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configuració de la pantalla"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Configuració Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Configuració de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Configuració de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilitzada per les trucades de veu"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilitzada quan la tauleta estigui inactiva"</string>
@@ -1392,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Canvia al mode d\'avió per estalviar energia en zones sense cobertura de telefonia mòbil"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria utilitzada per la pantalla i la retroil·luminació"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Redueix la brillantor i/o el temps d\'espera de la pantalla"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateria utilitzada per Wi-fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Desactiva la Wi-Fi quan no s\'utilitzi o quan no estigui disponible"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Bateria utilitzada per Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Desactiva la Wi-Fi quan no s\'utilitzi o quan no estigui disponible"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bateria utilitzada per Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Desactiva el Bluetooth quan no s\'utilitzi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Prova de connectar-te a un altre dispositiu Bluetooth"</string>
@@ -1431,14 +1458,15 @@
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Defineix la llengua utilitzada per a la síntesi de veu"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vull escoltar un exemple"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Reprodueix una breu demostració de síntesi de veu"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"Instal·la fitxers de dades de veu"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instal·la els fitxers de dades de veu necessaris per a la síntesi de veu"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"Instal·la dades de veu"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Instal·la les dades de veu necessàries per a la síntesi de veu"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Les veus necessàries per a la síntesi de la parla no estan instal·lades correctament"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"La configuració ha canviat. Això és un exemple de com sonen."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"El motor que has triat no es pot executar."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecciona un altre motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Pot ser que aquest motor de síntesi de la parla pugui recopilar tot el text que es dirà en veu alta, incloses les dades personals, com ara les contrasenyes i els números de les targetes de crèdit. Ve del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voleu activar l\'ús d\'aquest motor de síntesi de la parla?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Aquest idioma requereix una connexió activa a la xarxa per generar síntesi de veu."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motors"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuració de: <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> està activat"</string>
@@ -1456,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferit"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control d\'energia"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"S\'està actualitzant la configuració Wi-fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"S\'està actualitzant la configuració Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"S\'està actualitzant la configuració de Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desactivat"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"s\'està activant..."</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"s\'està desactivant…"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronització"</string>
@@ -1479,9 +1507,12 @@
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instal·la els certificats des de l\'emmagatzematge"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instal·la els certificats des de la targeta SD"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Esborra els certificats"</string>
-    <string name="credentials_reset_summary" msgid="3369361230171260282">"Elimina tots els certificats"</string>
+    <string name="credentials_reset_summary" msgid="3369361230171260282">"Esborra tots els certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiança"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tipus d\'emmagatzematge"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"En maquinari"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,20 +1533,20 @@
     <string name="privacy_settings_title" msgid="4856282165773594890">"Còpia de seguretat i restauració"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Còpia de seguretat i restauració"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dades personals"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Còpia de seguretat de les dades"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Fes una còpia de seguretat als servidors de Google de dades d\'aplicacions, contrasenyes Wi-Fi i altres opcions de configuració"</string>
+    <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="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="local_backup_password_title" msgid="3860471654439418822">"Contrasenya per a còpies de seguretat d\'ordinador"</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Actualment les còpies de seguretat d\'ordinador completes no estan protegides"</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>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"S\'ha definit una contrasenya per a còpia de seguretat nova"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"La contrasenya nova i la confirmació no coincideixen"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Error en definir la contrasenya de la còpia de seguretat"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vols deixar de fer còpies de seguretat de les contrasenyes de Wi-Fi, de les adreces d\'interès, d\'altres opcions i dades d\'aplicacions i, a més, esborrar totes les còpies dels servidors de Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vols deixar de crear còpies de seguretat de les contrasenyes de Wi-Fi, de les adreces d\'interès, d\'altres opcions i dades d\'aplicacions i, a més, esborrar totes les còpies dels servidors de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuració d\'administració de dispositius"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador del dispositiu"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactiva"</string>
@@ -1531,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificacions"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"To de trucada i vibració"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configuració de Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connecta a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"S\'està connectant a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connectat a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configuració de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Connexió a una xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"S\'està connectant a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Addició d\'una xarxa"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"No connectat"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Afegeix una xarxa"</string>
@@ -1556,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"S\'està connectant..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Vés al pas següent"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no és compatible."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"No pots configurar una connexió Wi-Fi EAP durant la configuració. Després, pots dur a terme aquesta acció a Configuració &gt; Connexions sense fil i xarxes."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No pots configurar una connexió Wi-Fi EAP durant la configuració. Quan hagi finalitzat, pots dur a terme aquesta acció a Configuració &gt; Sense fil i xarxes."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connexió pot trigar una estona..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Següent"</b>" per continuar amb la configuració."\n\n"Toca "<b>"Enrere"</b>" per connectar-te a una altra xarxa Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Següent"</b>" per continuar amb la configuració."\n\n"Toca "<b>"Enrere"</b>" per connectar a una altra xarxa Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronització activada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronització desactivada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronització"</string>
@@ -1567,14 +1598,14 @@
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronització"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"La sincronització té problemes. Es tornarà a activar aviat."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Afegeix un compte"</string>
-    <string name="background_data" msgid="5779592891375473817">"Dades de referència"</string>
+    <string name="background_data" msgid="5779592891375473817">"Dades en segon pla"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Les aplicacions poden sincronitzar, enviar i rebre dades en qualsevol moment"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"Desactiva dades referència?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Desactivar les dades de referència augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades de referència."</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"Desactiva dades segon pla?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Desactivar les dades en segon pla augmenta la durada de la bateria i disminueix l\'ús de dades. És possible que algunes aplicacions continuïn utilitzant la connexió de dades en segon pla."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sincr. autom. dades de l\'aplicació"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronització activa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sense sincronització"</string>
-    <string name="sync_error" msgid="5060969083117872149">"Error sincron."</string>
+    <string name="sync_error" msgid="5060969083117872149">"Error de sincronització"</string>
     <string name="last_synced" msgid="4242919465367022234">"Darrera sincronització: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"S\'està sincronitzant ara..."</string>
     <string name="settings_backup" msgid="2274732978260797031">"Còpia de seguretat de la configuració"</string>
@@ -1603,7 +1634,7 @@
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No es pot sincronitzar manualment"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades de referència i la sincronització automàtica."</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"En aquest moment, la sincronització d\'aquest element no està disponible. Per canviar la preferència, activa temporalment les dades en segon pla i la sincronització automàtica."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"configuració 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configura i gestiona la xarxa i el mòdem 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
@@ -1626,16 +1657,17 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Abans d\'executar-se, l\'aplicació de depuració espera que es connecti el depurador."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Dibuix"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Publicació accelerada per maquinari"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Supervisió"</string>
-    <string name="strict_mode" msgid="1938795874357830695">"Mode estricte activat"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"Centellejar si les aplicacions triguen molt al procés principal"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Mode estricte"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Centelleja si les aplicacions triguen molt al procés principal"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Ubicació del punter"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Superposa les dades dels tocs a la pantalla"</string>
     <string name="show_touches" msgid="1356420386500834339">"Mostra els tocs"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Mostra la ubicació dels tocs a la pantalla"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Mostra canvis de superfície"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Canvis de superfície"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Actualitza superfícies de finestres en actualitzar-se"</string>
-    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostra actualitzacions de GPU"</string>
+    <string name="show_hw_screen_updates" msgid="5036904558145941590">"Actualitzacions GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Actualitza vistes de finestres creades amb GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mostra actualitzacions capes"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Il·lumina capes de maquinari en verd en actualitzar-se"</string>
@@ -1643,38 +1675,35 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De millor a pitjor: blau, verd, vermell clar, vermell"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactiva superposicions HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per combinar pantalles"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Activa seguiments"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selecciona seguiments activats"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Actualment no hi ha seguiments activats"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activades actualment"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Totes les traces activades actualment"</string>
-    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa traces d\'OpenGL"</string>
+    <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activa seguiment d\'OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra límits de disseny"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Força l\'ús de GPU per a dibuixos en 2D"</string>
-    <string name="force_msaa" msgid="7920323238677284387">"Força MSAA de 4x"</string>
-    <string name="force_msaa_summary" msgid="9123553203895817537">"Activa MSAA de 4x a les aplicacions OpenGL ES 2.0"</string>
-    <string name="track_frame_time" msgid="6146354853663863443">"Representació GPU perfil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mesura temps representació a adb shell dumpsys gfxinfo"</string>
+    <string name="force_msaa" msgid="7920323238677284387">"Força MSAA  4x"</string>
+    <string name="force_msaa_summary" msgid="9123553203895817537">"Activa MSAA 4x en aplicacions d\'OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Depura operacions retall no rectangulars"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Perfil de renderització de GPU"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala d\'animació finestra"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala d\'animació transició"</string>
-    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala durada d\'animació"</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="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>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límita processos en segon pla"</string>
-    <string name="show_all_anrs" msgid="28462979638729082">"Mostra tots els errors sense resposta"</string>
+    <string name="show_all_anrs" msgid="28462979638729082">"Tots els errors sense resposta"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostra L\'aplicació no respon per a aplicacions de segon pla"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Fes servir WebView experimental"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Les aplicacions utilitzaran el WebView nou (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ús de dades"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cicle d\'ús de dades"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Itinerància de dades"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringeix dades de referència"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringeix dades en segon pla"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separa l\'ús de 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostra l\'ús de Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Mostra l\'ús de Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostra l\'ús d\'Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Zones de connexió mòbil"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronització automàtica de dades"</string>
@@ -1688,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Estableix límit de dades mòbils"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Estableix el límit de dades 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Estableix límit de dades 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Estableix límit de dades Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Defineix límit dades Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mòbil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1700,12 +1729,12 @@
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dades 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dades 4G"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Mostra la configuració de l\'aplicació"</string>
-    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringeix les dades de referència"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactiva dades de fons en xarxes mòbils. S\'utilitzaran xarxes no mòbils si estan disponibles."</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per restringir dades de referència, estableix un límit de dades mòbils."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vols restringir les dades de referència?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Aquesta funció pot provocar que una aplicació que depengui de les dades de fons deixi de funcionar quan hi hagi només xarxes mòbils disponibles."\n\n"Pots trobar més controls d\'ús de dades adequats a la configuració disponible a l\'aplicació."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Només pots restringir les dades de referència si has establert un límit de dades mòbils."</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringeix les dades en segon pla"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactiva dades en segon pla en xarxes mòbils. S\'utilitzaran xarxes no mòbils si estan disponibles."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Per restringir dades en segon pla, estableix un límit de dades mòbils."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Vols restringir les dades en segon pla?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Aquesta funció pot provocar que una aplicació que depengui de les dades en segon pla deixi de funcionar quan hi hagi només xarxes mòbils disponibles."\n\n"Pots trobar més controls d\'ús de dades adequats a la configuració disponible a l\'aplicació."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Només pots restringir les dades en segon pla si has establert un límit de dades mòbils."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar sincronització automàtica?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Els canvis que facis als teus comptes al web es reflectiran automàticament a la tauleta."\n\n"Alguns comptes com ara els comptes de Google també reflectiran al web els canvis que facis a la tauleta."\n\n"Per triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Els canvis que facis als teus comptes al web es reflectiran automàticament al telèfon."\n\n"Alguns comptes, com ara els comptes de Google, també reflectiran al web els canvis que hagis fet al telèfon."\n\n"Per triar els tipus d\'informació que vols que se sincronitzi en cada compte, vés a Configuració &gt; Comptes."</string>
@@ -1719,10 +1748,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitació de l\'ús de dades"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat."\n\n"Com que la tauleta mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La teva connexió de dades mòbil es desactivarà quan s\'arribi al límit especificat."\n\n"Com que el telèfon mesura la utilització de dades i és possible que l\'operador faci un recompte diferent de la utilització, et recomanem que facis servir un límit prudent."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vols restringir les dades de referència?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringeixes les dades mòbils de referència, algunes aplicacions i serveis no funcionaran sense connexió a una xarxa Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si restringeixes les dades mòbils de referència, algunes aplicacions i serveis no funcionaran sense connexió a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si restringeixes les dades mòbils en segon pla, determinats serveis i aplicacions no funcionaran tret que estiguis connectat a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris del telèfon."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vols restringir les dades en segon pla?"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringeixes les dades mòbils en segon pla, algunes aplicacions i serveis no funcionaran si no estàs connectat a una xarxa Wi-Fi."\n\n"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">"advertència"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitació"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicacions eliminades"</string>
@@ -1732,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>, segons mesura la tauleta. És possible que l\'operador faci un recompte diferent de la utilització."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ús aproximat de <xliff:g id="TOTAL">%1$s</xliff:g>, segons mesura el telèfon. És possible que l\'operador faci un recompte diferent de la utilització."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Zones de connexió mòbil"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecciona les xarxes Wi-Fi que siguin zones de connexió mòbil. Es pot impedir que les aplicacions utilitzin aquestes xarxes quan s\'executin en segon pla. A més, les aplicacions poden mostrar un avís abans d\'utilitzar aquestes xarxes per baixar fitxers grans."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecciona les xarxes Wi-Fi que siguin zones Wi-Fi mòbils. Pot ser que algunes aplicacions tinguin restringit l\'ús d\'aquestes xarxes quan funcionen en segon pla. També és possible que les aplicacions avisin abans d\'utilitzar aquestes xarxes per a baixades grans."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Xarxes mòbils"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Xarxes Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Per seleccionar zones de connexió mòbil, activa la Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Xarxes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Per seleccionar zones Wi-Fi mòbils, activa la Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Trucada d\'emergència"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a la trucada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
@@ -1784,8 +1813,8 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Corrector ortogràfic"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introdueix la contrasenya actual per a còpies de seguretat completes aquí"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introdueix una contrasenya nova per a còpies de seguretat completes aquí"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Torna a escriure tota la contrasenya de còpia de seguretat nova aquí"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Estableix una contrasenya de seguretat"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Torna a escriure aquí la contrasenya nova de còpia de seguretat completa"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Defineix contrasenya de seguretat"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancel·la"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualitzacions addicionals del sistema"</string>
@@ -1793,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissiu"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"En aplicació"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuaris"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Tu"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Altres usuaris"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Afegeix un usuari"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Actiu"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactiu"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Usuaris i perfils"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Afegeix un usuari o un perfil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringit"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Per crear un perfil restringit, has de configurar una pantalla de bloqueig per protegir les aplicacions i les dades personals."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Defineix el bloqueig"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No s\'ha configurat"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"No configurat: perfil restringit"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietari"</string>
+    <string name="user_you" msgid="1639158809315025986">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Àlies"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Afegeix"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Els usuaris tenen les seves aplicacions i el seu contingut"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Pots restringir l\'accés a les aplicacions i al contingut del teu compte."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuari"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringit"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Afegir un usuari nou"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Pots crear més usuaris per compartir aquest dispositiu amb altres persones. Cada usuari té el seu propi espai, que podrà personalitzar amb les seves pròpies aplicacions i els seus propis fons de pantalla. Els usuaris també podran ajustar les opcions de configuració de la tauleta, com ara la Wi-Fi, que afecten tots els usuaris."\n\n"Després de crear un usuari nou, aquest ha de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar els permisos d\'aplicacions actualitzats en nom dels altres usuaris."</string>
-    <string name="user_add_user_message_short" msgid="3310933423737035428">"Després de crear un usuari nou, aquesta persona haurà de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar permisos actualitzats en nom de la resta d\'usuaris."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Pots compartir aquest dispositiu amb altres persones si crees usuaris addicionals. Cada usuari té el seu propi espai, que podrà personalitzar amb les seves aplicacions, els seus fons de pantalla i altres elements. Els usuaris també podran ajustar la configuració de la tauleta, com ara la Wi-Fi, que pot afectar altres persones."\n\n"Quan hagis creat un usuari nou, aquesta persona haurà de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar els permisos actualitzats d\'aplicacions en nom de la resta d\'usuaris."</string>
+    <string name="user_add_user_message_short" msgid="3310933423737035428">"Quan afegeixis un usuari nou, aquesta persona ha de dur a terme un procés de configuració."\n\n"Qualsevol usuari pot acceptar permisos d\'aplicacions actualitzats en nom de la resta d\'usuaris."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vols configurar l\'usuari ara?"</string>
-    <string name="user_setup_dialog_message" msgid="614037943337008555">"Comprova que l\'usuari té accés a la tauleta i pot configurar el seu espai"</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Comprova que l\'usuari té accés a la tauleta i pot configurar el seu espai."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vols configurar el perfil ara?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configura ara"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ara no"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Només el propietari de la tauleta pot gestionar els usuaris."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Només el propietari del telèfon pot gestionar els usuaris."</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"Supr. <xliff:g id="USER_NAME">%1$s</xliff:g> del disposit."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Els perfils restringits no poden afegir comptes."</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Suprimeix <xliff:g id="USER_NAME">%1$s</xliff:g> del dispositiu"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Usuari nou"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Et vols suprimir a tu mateix?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vols eliminar l\'usuari?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vols suprimir el perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perdràs l\'espai i les dades de la tauleta. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perdràs l\'espai i les dades del telèfon. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"L\'espai i les dades d\'aquest usuari desapareixeran de la tauleta. No pots desfer aquesta acció."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"L\'espai i les dades d\'aquest usuari desapareixeran del telèfon. No pots desfer aquesta acció."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"L\'espai i les dades del perfil desapareixeran de la tauleta. No pots desfer aquesta acció."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"L\'espai i les dades del perfil desapareixeran del telèfon. No pots desfer aquesta acció."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"S\'està afegint un usuari nou..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Suprimeix l\'usuari"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Suprimeix"</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">"Amplia configuració aplicació"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Aquesta configuració afecta tots els usuaris de la tauleta."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Aquesta configuració afecta tots els usuaris del telèfon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Canvi de l\'idioma"</string>
@@ -1831,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emissions mòbils"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona els tipus d\'alertes d\'emergència que es mostraran."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restriccions d\'aplicacions i de contingut"</string>
+    <string name="user_rename" msgid="8523499513614655279">"CANVIA EL NOM"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Defineix límits a l\'aplicació"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permet la modificació de la sincronització i la configuració per Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permet l\'intercanvi de dades quan la tauleta toqui un altre dispositiu"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permet l\'intercanvi de dades quan el telèfon toqui un altre dispositiu"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Accés a la ubicació"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permet que les aplicacions utilitzin la informació de la teva ubicació"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Enrere"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Següent"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalitza"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Fes una foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Selecciona una foto de la galeria"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 67111d3..0fa7e05 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Pomalá"</item>
     <item msgid="1145554631248513562">"Běžná"</item>
     <item msgid="7553665153391107454">"Rychlá"</item>
-    <item msgid="2538100882620724753">"Velmi rychlá"</item>
+    <item msgid="1370673569131070146">"Rychlejší"</item>
+    <item msgid="4648206845228970803">"Velmi rychlá"</item>
+    <item msgid="4977949754169483251">"Svižná"</item>
+    <item msgid="6106302964845503577">"Velmi svižná"</item>
+    <item msgid="6800277205640837264">"Nejrychlejší"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Velmi nízká"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Žádné"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žádné"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nespecifikováno"</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">"Interní úložiště zařízení"</item>
     <item msgid="3738430123799803530">"Vyjímatelná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vybere systém"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Poloha"</item>
+    <item msgid="255608127647030286">"Osobní"</item>
+    <item msgid="4588829735729884491">"SMS a MMS"</item>
+    <item msgid="8971765125227378270">"Zařízení"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"přibližná poloha"</item>
+    <item msgid="5789673140227507995">"přesná poloha"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrace"</item>
+    <item msgid="3434165993711230924">"čtení kontaktů"</item>
+    <item msgid="616161687718081936">"úprava kontaktů"</item>
+    <item msgid="7638002295329050091">"čtení seznamu hovorů"</item>
+    <item msgid="6546959730920410907">"úprava seznamu hovorů"</item>
+    <item msgid="446877710771379667">"čtení kalendáře"</item>
+    <item msgid="7674458294386319722">"úprava kalendáře"</item>
+    <item msgid="8281201165558093009">"vyhledání sítí Wi-Fi"</item>
+    <item msgid="8694611243479480497">"oznámení"</item>
+    <item msgid="7776439107987345446">"vyhledání vysílače mobilní sítě"</item>
+    <item msgid="514615766544675057">"volání na telefon"</item>
+    <item msgid="8181415497109310680">"čtení zpráv SMS"</item>
+    <item msgid="6816551144382117307">"psaní zpráv SMS"</item>
+    <item msgid="4600463921908905030">"příjem zpráv SMS"</item>
+    <item msgid="5958926493289432745">"příjem nouzových SMS"</item>
+    <item msgid="4945269495221089540">"příjem zpráv MMS"</item>
+    <item msgid="5570472453573929087">"příjem zpráv WAP push"</item>
+    <item msgid="7125408150230860501">"odesílání zpráv SMS"</item>
+    <item msgid="7080337936612188061">"čtení ICC SMS"</item>
+    <item msgid="587124103118495063">"psaní ICC SMS"</item>
+    <item msgid="2320577158869025503">"úprava nastavení"</item>
+    <item msgid="1545733463471924009">"vykreslení navrch"</item>
+    <item msgid="3609046903962454582">"přístup k oznámením"</item>
+    <item msgid="4671646036128214513">"fotoaparát"</item>
+    <item msgid="1097324338692486211">"nahrávání zvuku"</item>
+    <item msgid="5031552983987798163">"přehrávání zvuku"</item>
+    <item msgid="8374996688066472414">"číst obsah schránky"</item>
+    <item msgid="3045529469061083747">"upravit obsah schránky"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Poloha"</item>
+    <item msgid="8677040780775113033">"Poloha"</item>
+    <item msgid="1660743989948992916">"Poloha"</item>
+    <item msgid="8791172739860195290">"Vibrace"</item>
+    <item msgid="383413555642128046">"Čtení kontaktů"</item>
+    <item msgid="3654594895269697313">"Úprava kontaktů"</item>
+    <item msgid="7928393476362362538">"Čtení seznamu hovorů"</item>
+    <item msgid="6248591205254641116">"Úprava seznamu hovorů"</item>
+    <item msgid="6093344633066170692">"Čtení kalendáře"</item>
+    <item msgid="1334886368750347692">"Úprava kalendáře"</item>
+    <item msgid="1638204101698708656">"Poloha"</item>
+    <item msgid="2154671955760380322">"Přidání oznámení"</item>
+    <item msgid="4282477730595931828">"Poloha"</item>
+    <item msgid="4891423912898525905">"Volání na telefon"</item>
+    <item msgid="626463821668200388">"Příjem SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Odesílání SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Příjem SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Příjem SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Příjem SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Příjem SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Odesílání SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Příjem SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Odesílání SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Úprava nastavení"</item>
+    <item msgid="736541391767350377">"Vykreslení navrch"</item>
+    <item msgid="5530815681721654194">"Přístup k oznámením"</item>
+    <item msgid="781213371706962767">"Fotoaparát"</item>
+    <item msgid="1720492593061838172">"Nahrávání zvuku"</item>
+    <item msgid="3493046322001257041">"Přehrávání zvuku"</item>
+    <item msgid="136815868796597058">"Číst obsah schránky"</item>
+    <item msgid="5238692940326972503">"Upravit obsah schránky"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátká"</item>
     <item msgid="2560532955514699713">"Střední"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"Zásobník volání funkce glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Vypnuto"</item>
+    <item msgid="675719912558941285">"Vykreslit neobdélníkový výstřižek modře"</item>
+    <item msgid="1064373276095698656">"Zvýraznit testované příkazy kreslení zeleně"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Vypnuto"</item>
+    <item msgid="2751513398307949636">"Na obrazovce ve formě sloupců"</item>
+    <item msgid="8272260411216018353">"Na obrazovce ve formě řádků"</item>
+    <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardní limit"</item>
     <item msgid="4071574792028999443">"Procesy na pozadí deaktivovány"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ff60a1c..46155dc 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -23,8 +23,8 @@
     <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">"Jste pouhé <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí od toho, abyste se stali vývojářem."</item>
-    <item quantity="other" msgid="6722953419953594148">"Jste <xliff:g id="STEP_COUNT">%1$d</xliff:g> klepnutí od toho, abyste se stali vývojářem."</item>
+    <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>
     <string name="show_dev_on" msgid="1110711554982716293">"Nyní jste vývojář."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V letadle"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Další..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrátová připojení a sítě"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Spravovat Wi-Fi, Bluetooth, režim V letadle, mobilní sítě a sítě VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovat Wi-Fi, Bluetooth, režim V letadle, mobilní sítě a sítě VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Datový roaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Používat datové služby při roamingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Používat datové služby při roamingu"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadejte text, který se zobrazí na zamčené obrazovce"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobrazovat uživatele na uzamčené obrazovce"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info o uživateli"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobrazit informace o profilu na obrazovce uzamčení"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informace o profilu"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Přístup k poloze"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zařízení"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Správci zařízení"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobrazit nebo deaktivovat správce zařízení"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnout Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamatovat nastavení"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Bezdrátový displej"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Chcete-li zobrazit zařízení, zapněte bezdrátový displej."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Bezdrátový displej je zakázaný, protože síť Wi-Fi je vypnutá."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bezdrátový displej je zakázán, protože je vypnuté připojení Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Hledat displeje"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Vyhledávání…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"V okolí nenalezeny žádné bezdr. displeje"</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Pokud je funkce zapnuta, můžete přenášet obsah aplikace do jiného zařízení s funkcí NFC tím, že podržíte zařízení blízko sebe. Můžete například přenášet stránky prohlížeče, videa YouTube, kontakty a další."\n\n"Přiložte zařízení k sobě (zpravidla zadní stranou) a dotkněte se obrazovky. Aplikace určí, jaký obsah se bude přenášet."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Zjistitelnost po síti"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Povolit aplikacím v jiných zařízeních vyhledávat aplikace v tomto zařízení"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Zapnout WiFi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Nastavení WiFi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnout Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavení Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastavit a spravovat přístupové body bezdrátové sítě"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Vybrat síť Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Zapínání Wi-Fi"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Vypínání Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vybrat síť Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Zapínání Wi‑Fi…"</string>
+    <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 V letadle"</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="3038290727701553612">"Oznamovat dostupné nezabezpečené sítě"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Ignorovat slabá připojení"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení."</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi zapnutá v režimu spánku"</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_scan_always_available" msgid="3470564139944368030">"Hledání vždy zapnuto"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Instalace certifikátů"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za účelem zvýšení přesnosti a k dalším účelům mohou aplikace Google a další aplikace vyhledávat sítě Wi-Fi v okolí, i když je Wi-Fi vypnuta. Chcete-li to zakázat, přejděte do části Pokročilé &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikace mohou vyhledávat sítě v okolí i v případě, že je Wi-Fi vypnuta. Chcete-li nastavení změnit, přejděte do části Pokročilé &gt; Hledání vždy zapnuto."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tuto zprávu příště nezobrazovat"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi aktivní i v režimu spánku"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Při změně nastavení se vyskytl problém"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimalizace Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalizuje využití baterie při zapnuté síti Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizace Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovat využití baterie při zapnuté síti Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Přidat síť"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Sítě WiFi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Sítě Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačítko WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Další možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadání kódu WPS PIN"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Přímé přip. Wi-Fi"</string>
+    <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">"Pokročilé"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Chcete-li zobrazit dostupné sítě, zapněte Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Vyhledávání sítí Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Chcete-li zobrazit dostupné sítě, zapněte Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Vyhledávání sítí Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemáte oprávnění ke změně sítě Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Jiná síť…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Další"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. nastavení (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"K dokončení nastavení tablet potřebuje přístup k síti Wi-Fi. Po nastavení můžete přepínat mezi mobilním datovým připojením a sítí Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"K dokončení nastavení potřebuje tablet přístup k síti Wi-Fi. Po nastavení můžete přepínat mezi mobilním datovým připojením a sítí Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobrazit pokročilé možnosti"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Chráněné nastavení Wi-Fi"</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="7204827509934892103">"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="8067502591043979939">"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_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_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="5754399645462924103">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Nastavování WPS probíhá a dokončení procesu může trvat až dvě minuty."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spuštění WPS se nezdařilo. Zkuste to znovu za několik minut."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavení zabezpečení bezdrátového směrovače (WEP) není podporováno"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Chyba ověření. Zkuste to prosím znovu."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Byla zjištěna další relace WPS. Zkuste prosím to znovu za několik minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID sítě"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Zadejte SSID."</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečení"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Síla signálu"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stav"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Chcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Zamítnout"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Připojit"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstranit"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nepřeskakovat"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"UPOZORNĚNÍ: Může dojít k tomu, že vám operátor bude účtovat vyšší poplatky než obvykle."\n\n"Nastavení tabletu může vyžadovat přenos nemalého množství dat."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORNĚNÍ: Může dojít k tomu, že vám operátor bude účtovat vyšší poplatky než obvykle."\n\n"Nastavení telefonu může vyžadovat přenos nemalého množství dat."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UPOZORNĚNÍ: Tablet nebude moci ověřit, zda je váš software aktuální."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UPOZORNĚNÍ: Telefon nebude moci ověřit, zda je váš software aktuální."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tabletu se nepodařilo připojit k této síti Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonu se nepodařilo připojit k této síti Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Rozšířené nastavení Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenční pásmo Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UPOZORNĚNÍ: Dokud nebudete připojeni k internetu, tablet nebude moci ověřit, zda je software aktuální."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UPOZORNĚNÍ: Dokud nebudete připojeni k internetu, telefon nebude moci ověřit, zda je software aktuální."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletu se nepodařilo připojit k této síti Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonu se nepodařilo připojit k této síti Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Rozšířené nastavení Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Frekvenční pásmo Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Uveďte provozní frekvenční rozsah"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Při nastavení frekvenčního pásma došlo k problému."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Délka síťové předpony"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Přímé připojení sítě Wi-Fi"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informace o zařízení"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Pamatovat si toto připojení"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Hledání zařízení"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušit pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušit pozvánku ke spojení s klientem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstranit tuto skupinu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Přenosný hotspot Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Zapínání hotspotu…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Vypínání hotspotu…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Přenosný hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba přenosného hotspotu Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastavit hotspot sítě Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"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_failed_subtext" msgid="1484941858530919002">"Chyba přenosného hotspotu Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavit hotspot sítě Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -668,7 +690,7 @@
     <string name="notification_sound_title" msgid="5137483249425507572">"Výchozí zvuk oznámení"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"Upozornění"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Oznámení"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitost příchozích hovorů také pro oznámení"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Výchozí zvuk oznámení"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Média"</string>
@@ -726,8 +748,8 @@
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Při nabíjení"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Při vložení do doku"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vyp."</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Chcete-li nastavit, co se stane, když je telefon v doku nebo v režimu spánku, zapněte funkci Spořič obrazovky."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdy spustit spořič obrazovky"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Chcete-li nastavit, co se má stát, když se telefon ocitne v doku nebo v režimu spánku, zapněte spořič obrazovky."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kdy spořič spustit"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začít"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Síla signálu"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Síť"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresa MAC sítě WiFi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC sítě Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa zařízení Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nedostupný údaj"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Název přístupového bodu (APN) povolen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Název přístupového bodu (APN) zakázán"</string>
     <string name="bearer" msgid="594270280031923558">"Nositel"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Hodnota MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Smazat název přístupového bodu"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový přístupový bod"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložit"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Nápověda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilní sítě"</string>
     <string name="location_title" msgid="1029961368397484576">"Moje poloha"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Poloha Wi-Fi a mobilní sítě"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilní sítě"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Povolit aplikacím používat službu 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="7457348712272184793">"Poloha určená sítí Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha určená sítí Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Povolit aplikacím ve vašem tabletu určovat polohu pomocí GPS"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Povolit aplikacím ve vašem telefonu určovat polohu pomocí GPS"</string>
@@ -1058,8 +1082,8 @@
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstalovat"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Odinstalovat pro všechny uživatele"</string>
     <string name="install_text" msgid="884360662922471113">"Instalovat"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Vypnout"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Povolit"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Deaktivovat"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Aktivovat"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Vymazat data"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinstalovat aktualizace"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aplikace byla nastavena, aby se pro některé akce spouštěla jako výchozí."</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtrovat"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Vyberte možnosti filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Vše"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktivované"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Stažené"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spuštěné"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Úložiště USB"</string>
@@ -1135,12 +1160,15 @@
     <string name="move_app_failed_dlg_text" msgid="3465267182923054022">"Přesunutí aplikace se nezdařilo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umístění pro instalaci"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Zakázat integrovanou aplikaci"</string>
-    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Pokud zakážete integrovanou aplikaci, může se stát, že ostatní aplikace přestanou fungovat správně."</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Deaktivovat integrovanou aplikaci"</string>
+    <string name="app_disable_dlg_text" msgid="3562567756362627323">"Pokud deaktivujete integrovanou aplikaci, může se stát, že ostatní aplikace přestanou fungovat správně."</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Vymazat data a deaktivovat aplikaci?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Pokud deaktivujete integrovanou aplikaci, mohou se ostatní aplikace chovat nestandardně. Budou také smazána vaše data."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnout oznámení?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Pokud v této aplikaci vypnete oznámení, můžete přijít o důležitá upozornění a aktuality."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Operace aplikací"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Spuštěno"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nebylo použito)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využití úložiště"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Zobrazit aplikacemi používané úložiště"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Slovo:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Zkratka:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jazyk:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Napište slovo."</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Volitelná zkratka"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Upravit slovo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Upravit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Smazat"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavení fyzické klávesnice"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Pro vývojáře"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Umožňuje nastavit možnosti pro vývoj aplikací"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Pro tohoto uživatele jsou možnosti vývojáře nedostupné."</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ladění USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Povolit režim ladění s připojeným zařízením USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Zrušit autorizace k ladění USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Hlášení chyb z hlavní nabídky"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Zahrnout v hlavní nabídce možnost k vytvoření zprávy o chybách"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nevypínat obrazovku"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Povolit nastavení pro vývojáře?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Tato nastavení jsou určena pouze pro vývojáře. Mohou způsobit rozbití nebo nesprávné fungování zařízení a nainstalovaných aplikací."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Ověřit aplikace instal. přes USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Přiblížení obrazovky"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automaticky aktualizovat přiblížení"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktual. přiblížení obrazovky při přepnutí aplikací"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tlačítko Napájení ukončuje hovor"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tlač. Napájení ukončí hovor"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Vyslovovat hesla"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Prodleva dotyku a podržení"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Usnadnění přístupu k webu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavení"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuto"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuto"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Povoleno"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepovoleno"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povolit"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nepovolovat"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Použít službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Služba <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zaznamenává veškerý text, který napíšete, kromě hesel. To zahrnuje osobní údaje, jako jsou čísla platebních karet. Zaznamenává také údaje o interakci s tabletem."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Služba <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zaznamenává veškerý text, který napíšete, kromě hesel. To zahrnuje osobní údaje, jako jsou čísla platebních karet. Zaznamenává také údaje o interakci s telefonem."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Ukončit službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Klepnutím na tlačítko OK službu <xliff:g id="SERVICE">%1$s</xliff:g> ukončíte."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Sledovat vlastní akce"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Při používání aplikací vás budeme informovat o provedených akcích."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Zastavit službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Klepnutím na tlačítko OK službu <xliff:g id="SERVICE">%1$s</xliff:g> ukončíte."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Žádná služba není nainstalována"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potřebujete čtečku obrazovky?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack poskytuje mluvenou navigaci nevidomým a slabozrakým uživatelům. Chcete tuto aplikaci stáhnout zdarma ze služby Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikace nainstalovaly skripty Google, které usnadní přístup k jejich webovému obsahu?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozici není žádný popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavení"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterie"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíjení"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Obrazovka zapnutá"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktivní"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Probudit"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilní sítě"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Doba provozu modulu Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Doba provozu sítě Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Doba provozu Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Doba provozu modulu Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti historie"</string>
     <string name="details_title" msgid="3792801565213935385">"Podrobnosti používání"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Upravit spotřebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
     <string name="power_screen" msgid="3023346080675904613">"Displej"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Pohotovostní režim"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popředí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázat režim spánku"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Připojení WiFi aktivní"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi je aktivní"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Odeslaná data"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informace o aplikaci"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavení aplikace"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavení obrazovky"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavení Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavení Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavení Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využití baterie hlasovými hovory"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využití baterie v pohotovostním režimu tabletu"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"V oblastech bez pokrytí přepněte do režimu V letadle"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využití baterie displejem a podsvícením"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Snižte jas displeje nebo interval jeho vypínání"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Využití baterie sítí WiFi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Pokud síť Wi-Fi nepoužíváte nebo na daném místě není k dispozici, vypněte přijímač Wi-Fi."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Využití baterie modulem Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Pokud síť Wi-Fi nepoužíváte nebo na daném místě není k dispozici, vypněte modul Wi-Fi."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Využití baterie technologií Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Vypněte funkci Bluetooth, když ji nepoužíváte."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Zkuste se připojit k jinému zařízení Bluetooth"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovat"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vyberte jiný modul"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Modul pro syntézu řeči může shromažďovat veškerý mluvený text, včetně osobních dat jako jsou hesla nebo čísla kreditních karet. Je založen na modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete modul pro syntézu řeči aktivovat?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Pro tento jazyk je k převodu textu na hlasový výstup potřeba připojení k síti."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moduly"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavení modulu <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Položka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivována"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferovaný modul"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Obecné"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrola spotřeby energie"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Probíhá aktualizace nastavení Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Probíhá aktualizace nastavení Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Probíhá aktualizace nastavení Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"zapnuto"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"vypnuto"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínání"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínání"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizace"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odebrat všechny certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Typ úložiště"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarové"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Pouze software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohování a obnovení"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobní údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohování mých dat"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Zálohovat data aplikací, hesla sítí Wi-Fi a další nastavení na serverech Google"</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="auto_restore_title" msgid="5397528966329126506">"Automatické obnovení"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nové heslo se neshoduje s potvrzením hesla."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nastavení hesla pro zálohy selhalo"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Chcete přestat zálohovat hesla sítí Wi-Fi, záložky, další nastavení, data aplikací a vymazat všechny kopie ze serverů Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Chcete přestat zálohovat hesla sítí Wi-Fi, záložky, další nastavení, data aplikací a vymazat všechny kopie ze serverů Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavení správce zařízení"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Správce zařízení"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivovat"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Oznámení"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tón vyzvánění a vibrace"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Systém"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Nastavení připojení k síti Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Připojit k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Připojování k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Nastavení připojení k síti Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Připojení k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Připojování k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Přidat síť"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nepřipojeno"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Přidat síť"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Připojování…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Přejít k dalšímu kroku"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Protokol EAP není podporován."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Připojení Wi-Fi EAP nelze nakonfigurovat při instalaci. Můžete to provést po dokončení instalace v nabídce Nastavení v části Bezdrátová připojení a sítě."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Připojení Wi-Fi EAP nelze nakonfigurovat při instalaci. Můžete to provést po dokončení instalace v části Nastavení &gt; Bezdrátová připojení a sítě."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Připojování může trvat několik minut..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Chcete-li pokračovat v nastavení, dotkněte se možnosti "<b>"Další"</b>"."\n\n"Dotkněte se možnosti "<b>"Zpět"</b>", chcete-li se připojit k jiné síti Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chcete-li pokračovat v nastavení, klepněte na "<b>"Další"</b>"."\n\n"Chcete-li se připojit k jiné síti Wi-Fi, klepněte na "<b>"Zpět"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizace zapnuta"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizace deaktivována"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizace."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikace čeká na připojení ladicího programu"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Vstup"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Kresba"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardwarově urychlené vykreslování"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Sledování"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Přísný režim aktivován"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Blikání při dlouhých operacích hlavního vlákna"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od nejlepšího k nejhoršímu: modrá, zelená, světle červená, červená"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázat HW vrstvy"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky."</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Povolit sledování"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vybrat povolená sledování"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Žádná sledování nejsou momentálně povolena."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Momentálně povolená sledování: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Všechna sledování jsou momentálně povolena."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povolit trasování OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobrazit ohraničení"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobrazit u klipu ohraničení, okraje atd."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Vynutit použití GPU pro 2D vykreslování"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Vynutit 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Povolit 4x MSAA v aplikacích OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Ladění operací s neobdélníkovými výstřižky"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil – vykreslování GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Měřit čas vykreslování v adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Měřítko animace okna"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Omezení procesů na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobrazit všechny ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialog Aplikace neodpovídá pro aplikace na pozadí"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Použít zkušební zob. webu"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikace použijí nejnovější zobrazení webu (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Přenesená data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítání dat"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Datový roaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Omezení dat na pozadí"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Oddělit datové přenosy 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Zobrazit využití sítě Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Zobrazit využití Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Zobrazit využití ethernetu"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobilní hotspoty"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatická synchronizace dat"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nastavit limit mobilních dat"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastavit limit dat 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Nastavit limit dat 2G–3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Nastavit limit dat. přen. Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Datový limit Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí tabletu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosažení stanoveného limitu bude datové připojení k síti zakázáno."\n\n"Protože se přenesená data měří pomocí telefonu a operátor je může účtovat odlišně, je vhodné nastavit nízký limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Omezení datových přenosů na pozadí?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Omezíte-li využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Pokud omezíte používání mobilních datových přenosů na pozadí, budou některé aplikace a služby fungovat, pouze když budete připojeni k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Pokud omezíte používání mobilních datových přenosů na pozadí, budou některé aplikace a služby fungovat, pouze když budete připojeni k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Pokud omezíte využití mobilních dat na pozadí, některé aplikace a služby nebudou fungovat, dokud se nepřipojíte k síti Wi-Fi."\n\n"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornění"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>" "<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n</string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odebrané aplikace"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: podle měření tabletu využito asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor může využití dat účtovat odlišně."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: podle měření telefonu využito asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor může využití dat účtovat odlišně."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilní hotspoty"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Vyberte sítě Wi-Fi, které jsou mobilními hotspoty. Aplikacím na pozadí může být používání těchto sítí zakázáno. Aplikace také mohou před stahováním velkých souborů pomocí těchto sítí zobrazit upozornění."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Vyberte sítě Wi-Fi, které jsou mobilními hotspoty. Aplikacím na pozadí může být používání těchto sítí zakázáno. Aplikace také mohou před stahováním velkých souborů pomocí těchto sítí zobrazit upozornění."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilní sítě"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Sítě Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Chcete-li vybrat mobilní hotspoty, zapněte připojení Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Sítě Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Chcete-li vybrat mobilní hotspoty, zapněte Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tísňové volání"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zpět k hovoru"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Název"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Mírné"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Přísné"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uživatelé"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Vy"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Další uživatelé"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Přidat uživatele"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktivní"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktivní"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Uživatelé a profily"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Přidat uživatele nebo profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Omezený profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Před vytvořením omezeného profilu je nutné nejprve nastavit zámek obrazovky k ochraně aplikací a dat."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nastavit zámek"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Není nastaveno"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Není nastaveno – omezený profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
+    <string name="user_you" msgid="1639158809315025986">"Vy (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Přezdívka"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Přidat"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Uživatelé mají své vlastní aplikace a obsah."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Můžete omezit přístup k aplikacím a obsahu ze svého účtu"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Uživatel"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omezený profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Přidat nového uživatele"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má své prostředí, které může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení tabletu (např. Wi-Fi), která ovlivní všechny ostatní uživatele."\n\n"Když vytvoříte nového uživatele, bude muset provést nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Vytvořením dalších uživatelů můžete toto zařízení sdílet s jinými lidmi. Každý uživatel má své prostředí, které může personalizovat, nainstalovat své aplikace, tapetu atd. Uživatelé také mohou upravit nastavení tabletu (např. Wi-Fi), která ovlivní všechny ostatní uživatele."\n\n"Když vytvoříte nového uživatele, daná osoba bude muset projít procesem nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Když vytvoříte nového uživatele, bude muset provést nastavení."\n\n"Každý uživatel může přijmout aktualizovaná oprávnění aplikací jménem všech ostatních uživatelů."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nastavit uživatele?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Ujistěte se, že je uživatel k dispozici a může si na tabletu nastavit svůj prostor"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nastavit profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nastavit"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nyní ne"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Uživatele smí spravovat pouze vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Uživatele smí spravovat pouze vlastník telefonu."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Pomocí omezených profilů nelze přidávat účty."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Smazat <xliff:g id="USER_NAME">%1$s</xliff:g> ze zařízení"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový uživatel"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete smazat sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Chcete uživatele odebrat?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Odebrat profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Přijdete o místo a data v tomto tabletu. Tuto akci nelze vrátit zpět."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Přijdete o místo a data v tomto telefonu. Tuto akci nelze vrátit zpět."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Místo v paměti a data uživatele budou z tabletu smazána. Tuto akci nelze vrátit zpět."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Místo v paměti a data uživatele budou z telefonu smazána. Tuto akci nelze vrátit zpět."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Místo v paměti a data profilu budou z tabletu smazána. Tuto akci nelze vrátit zpět."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Místo v paměti a data profilu budou z telefonu smazána. Tuto akci nelze vrátit zpět."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Přidávání nového uživatele…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Smazat uživatele"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Smazat"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavení ovlivní všechny uživatele tohoto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavení ovlivní všechny uživatele tohoto telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Změna jazyka"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasílání zpráv v rámci buňky"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy mimořádných upozornění, která chcete zobrazovat."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Omezení aplikací a obsahu"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PŘEJMENOVAT"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nastavit omezení aplikace"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Povolit úpravy párování a nastavení zařízení Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Povolit výměnu dat, pokud se tablet dotkne jiného zařízení"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Povolit výměnu dat, pokud se telefon dotkne jiného zařízení"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Přístup k poloze"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Povolit aplikaci používat informace o vaší poloze"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Zpět"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Další"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Dokončit"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Vyfotit"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrat fotografii z Galerie"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index c3345b6..1dd8178 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Langsom"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Hurtig"</item>
-    <item msgid="2538100882620724753">"Meget hurtig"</item>
+    <item msgid="1370673569131070146">"Hurtigere"</item>
+    <item msgid="4648206845228970803">"Meget hurtig"</item>
+    <item msgid="4977949754169483251">"Hurtig"</item>
+    <item msgid="6106302964845503577">"Meget hurtig"</item>
+    <item msgid="6800277205640837264">"Hurtigst"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Meget lav"</item>
@@ -83,7 +87,7 @@
     <item msgid="1922181315419294640"></item>
     <item msgid="8934131797783724664">"Scanner ..."</item>
     <item msgid="8513729475867537913">"Opretter forbindelse..."</item>
-    <item msgid="515055375277271756">"Godkender ..."</item>
+    <item msgid="515055375277271756">"Godkender..."</item>
     <item msgid="1943354004029184381">"Henter IP-adresse…"</item>
     <item msgid="4221763391123233270">"Tilsluttet"</item>
     <item msgid="624838831631122137">"Midlertidigt standset"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Ingen"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Ikke angivet"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ingen"</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">"Intern lagring på enheden"</item>
     <item msgid="3738430123799803530">"SD-kort, der kan fjernes"</item>
     <item msgid="4498124044785815005">"Lad systemet vælge"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Placering"</item>
+    <item msgid="255608127647030286">"Personlig"</item>
+    <item msgid="4588829735729884491">"Beskeder"</item>
+    <item msgid="8971765125227378270">"Enhed"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"omtrentlig placering"</item>
+    <item msgid="5789673140227507995">"nøjagtig placering"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrer"</item>
+    <item msgid="3434165993711230924">"læs kontaktpersoner"</item>
+    <item msgid="616161687718081936">"rediger kontaktpersoner"</item>
+    <item msgid="7638002295329050091">"læs opkaldsliste"</item>
+    <item msgid="6546959730920410907">"rediger opkaldslisten"</item>
+    <item msgid="446877710771379667">"læs kalenderen"</item>
+    <item msgid="7674458294386319722">"rediger kalenderen"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-scanning"</item>
+    <item msgid="8694611243479480497">"underretning"</item>
+    <item msgid="7776439107987345446">"mobilscanning"</item>
+    <item msgid="514615766544675057">"ring til telefon"</item>
+    <item msgid="8181415497109310680">"læs sms"</item>
+    <item msgid="6816551144382117307">"skriv sms"</item>
+    <item msgid="4600463921908905030">"modtag sms"</item>
+    <item msgid="5958926493289432745">"modtag nød-sms"</item>
+    <item msgid="4945269495221089540">"modtag mms"</item>
+    <item msgid="5570472453573929087">"modtag WAP-push"</item>
+    <item msgid="7125408150230860501">"send sms"</item>
+    <item msgid="7080337936612188061">"læs ICC-sms"</item>
+    <item msgid="587124103118495063">"skriv ICC-sms"</item>
+    <item msgid="2320577158869025503">"skift indstillinger"</item>
+    <item msgid="1545733463471924009">"tegn ovenpå"</item>
+    <item msgid="3609046903962454582">"underretninger om adgang"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"optag lyd"</item>
+    <item msgid="5031552983987798163">"afspil lyd"</item>
+    <item msgid="8374996688066472414">"læs udklipsholder"</item>
+    <item msgid="3045529469061083747">"rediger udklipsholder"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Placering"</item>
+    <item msgid="8677040780775113033">"Placering"</item>
+    <item msgid="1660743989948992916">"Placering"</item>
+    <item msgid="8791172739860195290">"Vibrer"</item>
+    <item msgid="383413555642128046">"Læs kontaktpersoner"</item>
+    <item msgid="3654594895269697313">"Rediger kontaktpersoner"</item>
+    <item msgid="7928393476362362538">"Læs opkaldslisten"</item>
+    <item msgid="6248591205254641116">"Rediger opkaldslisten"</item>
+    <item msgid="6093344633066170692">"Læs kalenderen"</item>
+    <item msgid="1334886368750347692">"Rediger kalenderen"</item>
+    <item msgid="1638204101698708656">"Placering"</item>
+    <item msgid="2154671955760380322">"Send underretning"</item>
+    <item msgid="4282477730595931828">"Placering"</item>
+    <item msgid="4891423912898525905">"Ring til telefon"</item>
+    <item msgid="626463821668200388">"Modtag sms/mms"</item>
+    <item msgid="1237538540368797101">"Send sms/mms"</item>
+    <item msgid="3986142739951490025">"Modtag sms/mms"</item>
+    <item msgid="3984213795861739778">"Modtag sms/mms"</item>
+    <item msgid="3656243523752472788">"Modtag sms/mms"</item>
+    <item msgid="8105802370238551510">"Modtag sms/mms"</item>
+    <item msgid="1407766984645388488">"Send sms/mms"</item>
+    <item msgid="1530132603376027248">"Modtag sms/mms"</item>
+    <item msgid="1188256962149204607">"Send sms/mms"</item>
+    <item msgid="4218544235221631789">"Skift indstillinger"</item>
+    <item msgid="736541391767350377">"Tegn ovenpå"</item>
+    <item msgid="5530815681721654194">"Underretninger om adgang"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Optag lyd"</item>
+    <item msgid="3493046322001257041">"Afspil lyd"</item>
+    <item msgid="136815868796597058">"Læs udklipsholder"</item>
+    <item msgid="5238692940326972503">"Rediger udklipsholder"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellem"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafik)"</item>
     <item msgid="1340692776955662664">"Kaldestak på glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Fra"</item>
+    <item msgid="675719912558941285">"Tegn ikke-rektangulært klippeområde med blåt"</item>
+    <item msgid="1064373276095698656">"Fremhæv testede tegnekommandoer med grønt"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Fra"</item>
+    <item msgid="2751513398307949636">"På skærmen som søjler"</item>
+    <item msgid="8272260411216018353">"På skærmen som linier"</item>
+    <item msgid="120512413928262547">"{0}Trans: left untranslated according to ws.{/0}{0} - daDA Wlgg 01/10/13 11:18{/0}"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgrænse"</item>
     <item msgid="4071574792028999443">"Ingen baggrundsprocesser"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b9aef25..2ad6bb7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Flytilstand"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mere..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløs og netværk"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN\'er"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN-netværk"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Opret forbindelse til datatjenester ved roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Opret forbindelse til datatjenester ved roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Indtast den tekst, der skal vises på den låste skærm"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brugeroplysninger ved låst skærm"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Brugeroplysninger"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Vis profiloplysninger på låseskærmen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiloplysninger"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Placeringsadgang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Enhedsadministration"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Enhedsadministratorer"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Vis eller deaktiver enhedsadministratorer"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Underretningsadgang"</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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå Bluetooth til"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk indstillinger"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Trådløs skærm"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Aktivér trådløs skærm for at se enhederne."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Trådløs skærm er deaktiveret, fordi Wi-Fi er slået fra."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Trådløs skærm er deaktiveret, fordi Wi-Fi er slået fra."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Søg efter skærme"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Søger…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Der blev ikke fundet nogen trådløse skærme."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funktion er slået til, kan du overføre appindhold til en anden NFC-kompatibel enhed ved at holde enhederne tæt sammen. For eksempel kan du overføre browsersider, YouTube-videoer, kontaktpersoner og meget mere."\n\n"Hold blot enhederne tæt sammen (typisk ryg mod ryg), og tryk derefter på din skærm. Appen afgør, hvad der bliver overført."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Registrering af netværkstjeneste"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillad, at apps på andre enheder kan finde apps på denne enhed"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå Wi-Fi til"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Indstillinger for Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Slå Wi-Fi til"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Indstillinger for Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguration og administration af trådløse adgangspunkter"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Vælg Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Aktiverer Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Slukker Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vælg Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Aktiverer Wi-Fi..."</string>
+    <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">"Netværksmeddelelse"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Fortæl mig, når der er et tilgængeligt åbent netværk"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undgå dårlige forbindelser"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hold Wi-Fi aktiveret i dvale"</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_scan_always_available" msgid="3470564139944368030">"Scanning er altid tilgængelig"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Lad Googles placeringstjeneste og andre apps scanne efter netværk, selv når Wi-Fi er slået fra"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer certifikater"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Google og andre apps scanner muligvis efter netværk i nærheden, selv når Wi-Fi er slukket, for at forbedre placeringsnøjagtighed m.m.. Hvis du ikke ønsker dette, kan du gå til Avanceret &gt; Scanning altid tilgængelig."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kan søge efter netværk i nærheden, selv når Wi-Fi er slukket. Hvis du ikke ønsker, at dette sker, skal du gå til Avanceret &gt; Scanning altid tilgængelig."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vis ikke igen"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktiveret i dvale"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi-optimering"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimer batteribrug, når Wi-Fi er slået til"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimer batteribrug, når Wi-Fi er aktiveret"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tilføj netværk"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netværk"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-netværk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-trykknap"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Flere valgmuligheder"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Angiv WPS-pinkode"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanceret"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glem netværk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Vis tilgængelige netværk ved at aktivere Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Søger efter Wi-Fi-netværk..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Se tilgængelige netværk ved at aktivere Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Søger efter Wi-Fi-netværk..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har ikke tilladelse til at ændre Wi-Fi-netværket."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Andre netværk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mere"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Din tablet skal have adgang til Wi-Fi for at kunne fuldføre konfigurationen. Efter konfigurationen kan du skifte mellem mobildata og Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Din tablet skal have adgang til Wi-Fi for at kunne fuldføre konfigurationen. Efter konfigurationen kan du skifte mellem mobildata og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avancerede valgmuligheder"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfiguration"</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="7204827509934892103">"Tryk på Wi-Fi-beskyttet konfiguration på din router. Det kaldes muligvis \"WPS\" eller indeholder dette symbol:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS er allerede i gang og kan tage op til to minutter at fuldføre"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislykkedes. Prøv igen om lidt."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhedsindstillingen til trådløse routere (WEP) understøttes ikke"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Godkendelsesfejl. Prøv igen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En anden WPS-session blev registreret. Prøv igen om et par minutter."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netværk-SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Indtast SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhed"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For at kunne angive mere nøjagtig placering og af andre grunde, ønsker <xliff:g id="APP_NAME">%1$s</xliff:g> at aktivere netværksscanning, selv når Wi-Fi er deaktiveret."\n\n"Vil du tillade dette for alle apps, der ønsker at scanne?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afvis"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Forbind"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glem"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Spring ikke over"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVARSEL! Du kan blive udsat for ekstraudgifter til mobilselskabet."\n\n"Konfiguration af tabletten kan kræve en betydelig mængde aktivitet på netværket."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL! Du kan blive udsat for ekstraudgifter til mobilselskabet."\n\n"Konfiguration af telefonen kan kræve en betydelig mængde aktivitet på netværket."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVARSEL! Tabletten vil ikke kunne kontrollere, om din software er opdateret."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVARSEL! Telefonen vil ikke kunne kontrollere, om din software er opdateret."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tabletten kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonen kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avanceret Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVARSEL! Din tablet kan ikke bekræfte, at din software er opdateret, før du har forbindelse til internettet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVARSEL! Telefonen kan ikke bekræfte, at din software er opdateret, før du har forbindelse til internettet."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletten kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonen kunne ikke oprette forbindelse til dette Wi-Fi-netværk."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanceret Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angiv frekvensintervallet"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problemer med indstillingen af frekvensbåndet."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Længde på netværkspræfiks"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Oplysninger om enheden"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Husk denne forbindelse"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Søg efter enheder"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du annullere invitationen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du annullere invitationen til at oprette forbindelse med <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppe?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverer hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Deaktiverer hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Det bærbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fejl ved bærbart Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfiguration af Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Fejl ved bærbart Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfiguration af 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> bærbart Wi-Fi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -727,7 +749,7 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Når enheden er tilsluttet en dockingstation"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Fra"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Hvis du vil kontrollere, hvad der sker, når telefonen tilsluttes en dockingstation og/eller går i dvale, skal du slå Dagdrøm til."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hvornår der skal dagdrømmes"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hvornår vil du dagdrømme"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nu"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signalstyrke"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Netværk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-adresse for Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Utilgængelig"</string>
@@ -807,7 +829,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"Medier"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Billeder, videoer"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musik, ringetoner, podcasts osv.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Lyd (musik, ringetoner osv.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Diverse"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Cachelagrede data"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Demonter delt hukommelse"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Adgangspunktet er aktiveret"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Adgangspunktet er deaktiveret"</string>
     <string name="bearer" msgid="594270280031923558">"Bærer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-værdi"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Slet APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Ny APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Gem"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjælp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilnetværk"</string>
     <string name="location_title" msgid="1029961368397484576">"Min placering"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Placering af Wi-Fi- og mobilnetværk"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Placering af Wi-Fi- og mobilnet."</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="7457348712272184793">"Placeringen fastlægges af Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Placeringen fastlægges af Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satellitter"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Tillad, at apps bruger GPS på din tablet til at udpege din placering"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Tillad, at apps bruger GPS på din telefon til at udpege din placering"</string>
@@ -967,7 +991,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Placering og søgning"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Lad Google bruge din placering til at forbedre søgeresultater og andre tjenester"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Adgang til min placering"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Tillad, at apps, der har bedt om tilladelse, bruger dine placeringsoplysninger"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Tillad apps, der har bedt om tilladelse, at bruge dine placeringsoplysninger"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Placeringskilder"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Om tabletcomputeren"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Vælg filtreringsmuligheder"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktiveret"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloads"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kørende"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lager"</string>
@@ -1119,7 +1144,7 @@
     <string name="empty_list_msg" msgid="5993162337235907160">"Du har ikke installeret nogen apps fra tredjepart."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flyt"</string>
-    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flyt til tabletcomputer"</string>
+    <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Flyt til tablet"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Flyt til telefon"</string>
     <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Flyt til USB-lager"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Flyt til SD-kort"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Hvis du deaktiverer en indbygget app, er det muligt, at andre apps ikke makker ret. Dine data vil også blive slettet."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vil du deaktivere meddelelser?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Hvis du deaktiverer meddelelser for denne app, kan du gå glip af vigtige beskeder og opdateringer."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Handlinger i app"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Kører"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrig brugt)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Lagerforbrug"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagerplads, der bruges af apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Ord:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Genvej:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Sprog:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Skriv et ord"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Valgfri genvej"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Rediger ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Rediger"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Slet"</string>
@@ -1227,7 +1257,7 @@
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"For alle sprog"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Flere sprog..."</string>
     <string name="testing" msgid="6584352735303604146">"Tester"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Oplysninger om tabletcomputer"</string>
+    <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>
@@ -1260,9 +1290,11 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Indstillinger for fysisk tastatur"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Indstillinger for udviklere"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Konfigurer valgmuligheder for appudvikling"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Valgmuligheder for udviklere er ikke tilgængelige for denne bruger"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Fejlretningstilstand, når USB er tilsluttet"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapporter om fejl i menu til startknap"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Tilbagekald tilladelser for USB-fejlfinding"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapportér fejl i menu til startknap"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Gør det muligt at rapportere fejl i menuen til startknappen"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Undgå dvale"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</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 fra alle computere, du tidligere har godkendt?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vil du tillade udviklingsindstillinger?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Disse indstillinger er kun beregnet til brug i forbindelse med udvikling. De kan forårsage, at din enhed og dens applikationer går ned eller ikke fungerer korrekt."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Kontrollér apps via USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Afbryderknappen afslutter opkaldet"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Indtal adgangskoder"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Forsinkelse på tryk og hold nede"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Styrk tilgængeligheden på nettet"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Indstillinger"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Til"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Fra"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tilladt"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ikke tilladt"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillad"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Tillad ikke"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Vil du bruge <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan indsamle al den tekst, som du skriver, undtagen adgangskoder. Dette omfatter personlige data såsom kreditkortnumre. Tjenesten kan også indsamle data om dine interaktioner med tabletten."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan indsamle al den tekst, som du skriver, undtagen adgangskoder. Dette omfatter personlige data såsom kreditkortnumre. Tjenesten kan også indsamle data om dine interaktioner med telefonen."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Vil du standse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Når du trykker på OK, standses <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"observere dine handlinger"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"modtage underretninger, når du interagerer med en app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Vil du standse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Når du trykker på OK, standses <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Der er ikke installeret nogen tjenester"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Har du brug for en skærmoplæser?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack giver talefeedback for at hjælpe blinde og svagtseende brugere. Vil du installere det gratis fra Android Marked?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Skal apps installere scripts fra Google, som gør deres webindhold mere tilgængeligt?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivelse til rådighed."</string>
     <string name="settings_button" msgid="3006713718908152930">"Indstillinger"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Oplader"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skærm til"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS slået til"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnetværkets signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Enhedens opvågningstid"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi til tiden"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi til tiden"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi til tiden"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi til tiden"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Oplysninger om oversigten"</string>
     <string name="details_title" msgid="3792801565213935385">"Brugsdetaljer"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbrug"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderede pakker"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skærm"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cellestandby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
@@ -1369,8 +1397,8 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU forgrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hold aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi aktiv"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletcomputer"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi aktiv"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Data modtaget"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Oplysninger om appen"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Indstillinger for app"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Indstillinger for skærm"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Indstillinger for Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Indstillinger for Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Indstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brugt af stemmeopkald"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri brugt, når tabletcomputeren ikke er aktiv"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Skift til flytilstand for at spare på strømmen i områder uden mobildækning."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri brugt af skærmen og baglyset."</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reducer skærmens lysstyrke og/eller skærmens timeout"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteri brugt af Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Deaktiver Wi-Fi, når det ikke er i brug eller tilgængeligt"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batteri brugt af Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Deaktiver Wi-Fi, når det ikke er i brug eller tilgængeligt"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batteri brugt af Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Deaktiver Bluetooth, når du ikke bruger det"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Prøv at oprette forbindelse til en anden Bluetooth-enhed"</string>
@@ -1416,7 +1444,7 @@
     <string name="recognizer_settings_title" msgid="432493301215113154">"Stemmesøgning"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Indstillinger for \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Indstillinger for tekst-til-tale"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Tekst-til-tale-output"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Tekst-til-tale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Brug altid mine indstil."</string>
     <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>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vælg en anden maskine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne tale kan muligvis indsamle al den tekst, der udtales, inklusive personlige data som adgangskoder og kreditkortnumre. Den kommer fra <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-maskinen. Aktivér brug af denne talesyntesemaskine?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Der kræves en aktiv netværksforbindelse, for at tekst-til-tale kan anvendes på dette sprog."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Maskiner"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-indstillinger"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktiveret"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Foretrukken maskine"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Generelt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Strømkontrol"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Opdaterer indstillinger for Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Opdaterer indstillinger for Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Opdaterer Bluetooth-indstilling"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"til"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"fra"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktiverer"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"deaktiverer"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkroniser"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle certifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Troværdige loginoplysninger"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis troværdige CA-certifikater"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Lagertype"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarebaseret"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Kun software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn dit oplåsningsmønster"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sikkerhedskopiering og gendannelse"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige oplysninger"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhedskopier data"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Sikkerhedskopier appdata, Wi-Fi-adgangskoder og andre indstillinger på Googles servere"</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">"Sikkerhedskonto"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Der er ingen konto, der i øjeblikket lagrer sikkerhedskopierede data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatisk gendannelse"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Ny adgangskode og bekræftelse matcher ikke"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Fejl under indstilling af sikkerhedskode"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vil du stoppe sikkerhedskopieringen af dine Wi-Fi-adgangskoder, bogmærker, andre indstillinger og appdata samt slette alle kopier på Googles servere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Enhedsadministrationsindstillinger"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhedsadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Underretninger"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringetone og vibration ved opkald"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Konfiguration af Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Opret forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Opretter forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Konfiguration af Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Opret forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Opretter forbindelse til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Tilføj et netværk"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ikke tilsluttet"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tilføj netværk"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Opretter forbindelse..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Gå til næste trin"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP understøttes ikke."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Du kan ikke konfigurere en EAP-Wi-Fi-forbindelse under konfigurationen. Efter konfigurationen kan du gøre dette i Indstillinger &gt; Trådløst og netværk."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Du kan ikke konfigurere en EAP-Wi-Fi-forbindelse under konfigurationen. Efter konfigurationen kan du gøre dette i Indstillinger &gt; Trådløst og netværk."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Oprettelsen kan tage et par minutter..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tryk på "<b>"Næste "</b>"for at fortsætte med opsætningen."\n\n" Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryk på "<b>"Næste"</b>" for at fortsætte med konfigurationen."\n\n" Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiveret"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync deaktiveret"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfejl."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Fejlrettet app venter på tilknytning af fejlfinder før udførelse"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Tegning"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardware-accelereret gengivelse"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Overvågning"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Striks tilstand aktiveret"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Blink med skærmen, når apps foretager handlinger på hovedtråd"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Fra bedst til værst: blå, grøn, lys rød, rød"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlejring"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Aktivér spor"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vælg aktiverede spor"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Der er i øjeblikket ingen aktiverede spor"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle spor er i øjeblikket aktiveret"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivér OpenGL-spor"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis layoutgrænser"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis grænser for klip, margener osv."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Gennemtving brug af GPU til 2D-tegning"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Tving 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Aktivér 4x MSAA i apps med OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Fejlfind på ikke-rektangulære klippehandlinger"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU-profilgengivelse"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mål gengivelsestiden i adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Animationsskala for vindue"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimationsskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animatorvarighedsskala"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Grænse for baggrundsprocesser"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Vis \"App svarer ikke\"-meddelelser"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis \"Appen svarer ikke\" for baggrundsapps"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Eksperimenterende WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Apps vil bruge det nyeste WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataforbrug"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus for dataforbrug"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dataroaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begræns baggrundsdata"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separat 4G-forbrug"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Vis brug af Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Vis brug af Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Vis Ethernet-brug"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobilhotspots"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Synkroniser data automatisk"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Angiv mobildatagrænse"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Angiv grænse for 4G-data"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Angiv grænse for 2G-3G-data"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Angiv grænse for Wi-Fi-data"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Angiv grænse for Wi-Fi-data"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din tablet, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Din mobildataforbindelse deaktiveres, når den angivne grænse er nået."\n\n"Da dataforbrug måles af din telefon, og dit mobilselskab muligvis bruger en anden metode til beregning af forbrug, kan du overveje at angive en lav grænse."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrænse baggrundsdata?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Hvis du begrænser mobildata i baggrunden, vil nogle apps og tjenester ikke fungere, medmindre du har forbindelse til et Wi-Fi-netværk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne telefon."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, medmindre du har forbindelse til et Wi-Fi-netværk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Hvis du begrænser mobildata, der kører i baggrunden, vil nogle apps og tjenester ikke fungere, hvis du ikke har forbindelse til et Wi-Fi-netværk."\n\n"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grænse"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apps"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brugt, målt af tablet. Mobilselskabers beregning af forbrug kan variere."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brugt, målt af telefon. Mobilselskabers beregning af forbrug kan variere."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilhotspots"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Vælg de Wi-Fi-netværk, som er mobilhotspots. Apps kan være forhindret i at bruge disse netværk, når de kører i baggrunden. Apps kan også advare dig, før disse netværk bliver brugt til store downloads."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Vælg de Wi-Fi-netværk, som er mobilhotspots. Apps kan være forhindret i at bruge disse netværk, når de kører i baggrunden. Apps kan også advare dig, før disse netværk bliver brugt til store downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnetværk"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-netværk"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Hvis du vil vælge mobilhotspots, skal du slå Wi-Fi til."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi-netværk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Hvis du vil vælge mobilhotspots, skal du slå Wi-Fi til."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødopkald"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbage til opkald"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Navn"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Eftergivende"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhæver"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Brugere"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Dig"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andre brugere"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Tilføj bruger"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Ikke aktiv"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Brugere og profiler"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Tilføj en bruger eller en profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begrænset profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Før du kan oprette en begrænset profil, skal du oprette en skærmlås for at beskytte dine apps og personlige data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Konfigurer låseskærmen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigureret"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ikke oprettet – begrænset profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Ejer"</string>
+    <string name="user_you" msgid="1639158809315025986">"Dig (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kaldenavn"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Tilføj"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Brugere har egne apps og eget indhold"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Du kan begrænse adgangen til apps og indhold fra din konto"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruger"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrænset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tilføj ny bruger"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Du kan dele denne enhed med andre personer ved at oprette yderligere brugere. Hver bruger har deres egen plads, som de kan tilpasse med deres egne apps, baggrunde osv. Brugerne kan også ændre indstillinger på tabletten, der påvirker alle, f.eks. indstillinger for Wi-Fi."\n\n"Når du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces."\n\n"Alle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enhed med andre personer ved at oprette yderligere brugere. Hver bruger har deres egen plads, som de kan tilpasse med deres egne apps, baggrunde osv. Brugerne kan også ændre indstillinger på tabletten, der påvirker alle, f.eks. indstillinger for Wi-Fi."\n\n"Når du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces."\n\n"Alle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du opretter en ny bruger, skal denne person gennemgå en oprettelsesproces."\n\n"Alle brugere kan acceptere opdaterede apptilladelser på vegne af alle andre brugere."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Vil du konfigurere brugeren nu?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for, at personen kan tage tabletten og etablere deres plads"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vil du oprette en profil nu?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurer nu"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ikke nu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Kun ejeren af tabletten kan administrere brugere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Kun ejeren af telefonen kan administrere brugere."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begrænsede profiler kan ikke tilføje konti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Slet <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enhed"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruger"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette dig selv?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vil du fjerne brugeren?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vil du fjerne profilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Du vil miste din plads og dine data på denne tablet. Du kan ikke fortryde denne handling."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Du vil miste din plads og dine data på denne telefon. Du kan ikke fortryde denne handling."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Denne brugers plads og data vil forsvinde fra denne tablet. Du kan ikke fortryde denne handling."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Denne brugers plads og data vil forsvinde fra denne telefon. Du kan ikke fortryde denne handling."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Denne profils plads og data vil forsvinde fra denne tablet. Du kan ikke fortryde denne handling."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Denne profils plads og data vil forsvinde fra denne telefon. Du kan ikke fortryde denne handling."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Tilføjer ny bruger..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Slet bruger"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Slet"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne indstilling påvirker alle brugere på denne tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne indstilling påvirker alle brugere på denne telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Skift sprog"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-id"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobilmeddelelser"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vælg de typer af nødalarmer, der skal vises."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Begrænsninger af apps og indhold"</string>
+    <string name="user_rename" msgid="8523499513614655279">"OMDØB"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Angiv applikationsgrænser"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Tillad ændring af Bluetooth-parringer og -indstillinger"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Tillad dataudveksling, når tabletten rører en anden enhed"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Tillad dataudveksling, når telefonen rører en anden enhed"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Placeringsadgang"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Tillad, at apps bruger dine placeringsoplysninger"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Tilbage"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Næste"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Udfør"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Tag billede"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Vælg billede fra Galleri"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 03d0143..9035730 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Langsam"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Schnell"</item>
-    <item msgid="2538100882620724753">"Sehr schnell"</item>
+    <item msgid="1370673569131070146">"Schneller"</item>
+    <item msgid="4648206845228970803">"Sehr schnell"</item>
+    <item msgid="4977949754169483251">"Schnell"</item>
+    <item msgid="6106302964845503577">"Sehr schnell"</item>
+    <item msgid="6800277205640837264">"Am schnellsten"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Sehr niedrig"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Keine Angabe"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Keine"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Keine Angabe"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Keine"</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">"Interner Gerätespeicher"</item>
     <item msgid="3738430123799803530">"Austauschbare SD-Karte"</item>
     <item msgid="4498124044785815005">"Auswahl durch das System"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Standort"</item>
+    <item msgid="255608127647030286">"Persönlich"</item>
+    <item msgid="4588829735729884491">"SMS/MMS"</item>
+    <item msgid="8971765125227378270">"Gerät"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"Ungefährer Standort"</item>
+    <item msgid="5789673140227507995">"Genauer Standort"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"Vibration"</item>
+    <item msgid="3434165993711230924">"Kontakte lesen"</item>
+    <item msgid="616161687718081936">"Kontakte ändern"</item>
+    <item msgid="7638002295329050091">"Anrufliste lesen"</item>
+    <item msgid="6546959730920410907">"Anrufliste ändern"</item>
+    <item msgid="446877710771379667">"Kalender lesen"</item>
+    <item msgid="7674458294386319722">"Kalender ändern"</item>
+    <item msgid="8281201165558093009">"WLAN-Scan"</item>
+    <item msgid="8694611243479480497">"Benachrichtigung"</item>
+    <item msgid="7776439107987345446">"Mobilfunknetz-Scan"</item>
+    <item msgid="514615766544675057">"Telefonieren"</item>
+    <item msgid="8181415497109310680">"SMS lesen"</item>
+    <item msgid="6816551144382117307">"SMS schreiben"</item>
+    <item msgid="4600463921908905030">"SMS empfangen"</item>
+    <item msgid="5958926493289432745">"Notfall-SMS empfangen"</item>
+    <item msgid="4945269495221089540">"MMS empfangen"</item>
+    <item msgid="5570472453573929087">"WAP-Push-Nachricht empfangen"</item>
+    <item msgid="7125408150230860501">"SMS senden"</item>
+    <item msgid="7080337936612188061">"ICC-SMS lesen"</item>
+    <item msgid="587124103118495063">"ICC-SMS schreiben"</item>
+    <item msgid="2320577158869025503">"Einstellungen ändern"</item>
+    <item msgid="1545733463471924009">"An oberste Position ziehen"</item>
+    <item msgid="3609046903962454582">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="4671646036128214513">"Kamera"</item>
+    <item msgid="1097324338692486211">"Audio aufnehmen"</item>
+    <item msgid="5031552983987798163">"Audio wiedergeben"</item>
+    <item msgid="8374996688066472414">"Zwischenablage lesen"</item>
+    <item msgid="3045529469061083747">"Zwischenablage ändern"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Standort"</item>
+    <item msgid="8677040780775113033">"Standort"</item>
+    <item msgid="1660743989948992916">"Standort"</item>
+    <item msgid="8791172739860195290">"Vibration"</item>
+    <item msgid="383413555642128046">"Kontakte lesen"</item>
+    <item msgid="3654594895269697313">"Kontakte ändern"</item>
+    <item msgid="7928393476362362538">"Anrufliste lesen"</item>
+    <item msgid="6248591205254641116">"Anrufliste ändern"</item>
+    <item msgid="6093344633066170692">"Kalender lesen"</item>
+    <item msgid="1334886368750347692">"Kalender ändern"</item>
+    <item msgid="1638204101698708656">"Standort"</item>
+    <item msgid="2154671955760380322">"Benachrichtigung posten"</item>
+    <item msgid="4282477730595931828">"Standort"</item>
+    <item msgid="4891423912898525905">"Telefonieren"</item>
+    <item msgid="626463821668200388">"SMS/MMS empfangen"</item>
+    <item msgid="1237538540368797101">"SMS/MMS senden"</item>
+    <item msgid="3986142739951490025">"SMS/MMS empfangen"</item>
+    <item msgid="3984213795861739778">"SMS/MMS empfangen"</item>
+    <item msgid="3656243523752472788">"SMS/MMS empfangen"</item>
+    <item msgid="8105802370238551510">"SMS/MMS empfangen"</item>
+    <item msgid="1407766984645388488">"SMS/MMS senden"</item>
+    <item msgid="1530132603376027248">"SMS/MMS empfangen"</item>
+    <item msgid="1188256962149204607">"SMS/MMS senden"</item>
+    <item msgid="4218544235221631789">"Einstellungen ändern"</item>
+    <item msgid="736541391767350377">"An oberste Position ziehen"</item>
+    <item msgid="5530815681721654194">"Auf Benachrichtigungen zugreifen"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Audio aufnehmen"</item>
+    <item msgid="3493046322001257041">"Audio wiedergeben"</item>
+    <item msgid="136815868796597058">"Zwischenablage lesen"</item>
+    <item msgid="5238692940326972503">"Zwischenablage ändern"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kurz"</item>
     <item msgid="2560532955514699713">"Mittel"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Grafik)"</item>
     <item msgid="1340692776955662664">"Aufrufliste für glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Aus"</item>
+    <item msgid="675719912558941285">"Nicht rechteckigen Clipbereich blau zeichnen"</item>
+    <item msgid="1064373276095698656">"Getestete Zeichenbefehle grün hervorheben"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Aus"</item>
+    <item msgid="2751513398307949636">"Auf Bildschirm als Balken"</item>
+    <item msgid="8272260411216018353">"Auf Bildschirm als Linien"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardlimit"</item>
     <item msgid="4071574792028999443">"Keine Hintergrundprozesse"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f1ea62e..48b9614 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -268,16 +268,16 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mehr..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Drahtlos &amp; Netzwerke"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Bei Roaming mit Datendienst verbinden"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Bei Roaming mit Datendienst verbinden"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Die Datenkonnektivität wurde unterbrochen, weil Sie Ihr Heimnetzwerk verlassen haben und Daten-Roaming nicht aktiviert ist."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivieren"</string>
-    <string name="roaming_warning" msgid="7625933694709170887">"Wenn Sie das Roaming zulassen, können hohe Roaming-Gebühren anfallen!"</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wenn Sie Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wenn Sie Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Roaming zulassen?"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Wenn Sie Daten-Roaming zulassen, können hohe Roaming-Gebühren anfallen!"</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Wenn Sie Daten-Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Wenn Sie Daten-Roaming zulassen, können erhebliche Roaming-Gebühren entstehen."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Daten-Roaming zulassen?"</string>
     <string name="networks" msgid="6333316876545927039">"Netzbetreiberauswahl"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Netzbetreiber auswählen"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum &amp; Uhrzeit"</string>
@@ -303,12 +303,14 @@
     <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="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Inhaberinformationen auf Sperrbildschirm anzeigen"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Infos zum Eigentümer auf Sperrbildschirm anzeigen"</string>
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info zum Eigentümer"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
-    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Text für Display-Sperre eingeben"</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Text für Sperrbildschirm eingeben"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Nutzerinformationen bei Bildschirmsperre anzeigen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Nutzerinformationen"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profilinformationen auf Sperrbildschirm anzeigen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformationen"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Standortzugriff"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sicherheit"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Geräteadministratoren"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Geräteadministratoren abrufen oder deaktivieren"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth aktivieren"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -495,7 +506,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Kabellose Übertragung"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Um Geräte zu sehen, aktivieren Sie die kabellose Übertragung."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Kabellose Übertragung ist deaktiviert, da WLAN deaktiviert ist."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Kabellose Übertragung ist deaktiviert, da WLAN deaktiviert ist."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Nach Displays suchen"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Suche läuft…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Keine kabellose Übertragung in der Nähe"</string>
@@ -525,50 +536,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Wenn diese Funktion aktiviert ist, können Sie App-Inhalte auf ein anderes NFC-fähiges Gerät beamen, indem Sie die Geräte dicht nebeneinander halten. Sie können beispielsweise Browserseiten, YouTube-Videos und Kontakte beamen."\n\n"Halten Sie die Geräte einfach dicht nebeneinander, am besten Rückseite an Rückseite, und berühren Sie den Bildschirm. Die App bestimmt, was übertragen wird."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Diensterkennung"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Ermöglicht Apps auf anderen Geräten, Apps auf diesem Gerät zu erkennen"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"WLAN aktivieren"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"WLAN"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"WLAN-Einstellungen"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"WLAN"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WLAN"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"WLAN aktivieren"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"WLAN"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN-Einstellungen"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"WLAN-Zugangspunkte festlegen und verwalten"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"WLAN auswählen"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"WLAN wird aktiviert..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"WLAN wird deaktiviert..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"WLAN auswählen"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"WLAN wird aktiviert…"</string>
+    <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="3038290727701553612">"Benachrichtigen, wenn ein offenes Netzwerk verfügbar ist"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"WLAN nur bei guter Internetverbindung verwenden"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"WLAN im Ruhezustand aktiviert lassen"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"WLAN nur bei guter Internetverbindung verwenden"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Erkennungsfunktion immer verfügbar"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Der Standortdienst von Google und andere Apps sollen auch bei deaktiviertem WLAN nach Netzwerken suchen."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Zertifikate installieren"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Zur Erhöhung der Standortgenauigkeit und aus anderen Gründen können Google und andere Apps auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps können auch bei deaktiviertem WLAN nach Netzwerken in der Nähe suchen. Wenn Sie das nicht möchten, können Sie dies unter \"Erweitert\" &gt; \"Scannen immer verfügbar\" ändern."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nicht erneut anzeigen"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"WLAN im Ruhemodus aktiviert lassen"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Beim Ändern der Einstellung ist ein Problem aufgetreten."</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"WLAN-Optimierung"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Akkuverbrauch bei aktiviertem WLAN minimieren"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WLAN-Optimierung"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Akkuverbrauch bei aktiviertem WLAN minimieren"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netzwerk hinzufügen"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"WLAN-Netzwerke"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"WLAN-Netzwerke"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-Push-Taste"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Weitere Optionen"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN-Eingabe"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netzwerk entfernen"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"WLAN aktivieren, um verfügbare Netze abzurufen"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Suche nach WLAN-Netzwerken läuft…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"WLAN aktivieren, um verfügbare Netze abzurufen"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Suche nach WLAN-Netzwerken läuft…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Sie verfügen nicht über die Berechtigung zum Ändern des WLAN-Netzwerks."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Anderes Netzwerk…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mehr"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisches Setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ihr Tablet muss eine WLAN-Verbindung haben, damit die Einrichtung abgeschlossen werden kann. Nach der Einrichtung können Sie zwischen WLAN und Mobilfunk wechseln."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Ihr Tablet muss eine WLAN-Verbindung haben, damit die Einrichtung abgeschlossen werden kann. Nach der Einrichtung können Sie zwischen WLAN und Mobilfunk wechseln."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Erweiterte Optionen einblenden"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Geschützte WLAN-Einrichtung"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS wird bereits durchgeführt. Dieser Vorgang kann bis zu 2 Minuten dauern."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS fehlgeschlagen. Bitte versuchen Sie es in einigen Minuten erneut."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die Sicherheitseinstellung für drahtlose Router (WEP) wird nicht unterstützt."</string>
@@ -576,6 +594,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentifizierungsfehler. Bitte versuchen Sie es erneut."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Es wurde eine andere WPS-Sitzung gefunden. Bitte versuchen Sie es in einigen Minuten erneut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Netzwerk-SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID eingeben"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicherheit"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstärke"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -602,6 +621,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Möchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Ablehnen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Entfernen"</string>
@@ -613,12 +635,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nicht überspringen"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"Achtung: Es können zusätzliche Kosten für die Datenübertragung vonseiten des Mobilfunkanbieters anfallen."\n\n"Das Einrichten des Tablets kann eine erhöhte Netzwerkaktivität erfordern."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"Achtung: Es können zusätzliche Kosten für die Datenübertragung vonseiten des Mobilfunkanbieters anfallen."\n\n"Das Einrichten des Telefons kann eine erhöhte Netzwerkaktivität erfordern."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"Achtung: Das Tablet kann nicht prüfen, ob Ihre Software aktuell ist."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"Achtung: Das Telefon kann nicht prüfen, ob Ihre Software aktuell ist."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Das Tablet konnte nicht auf dieses WLAN zugreifen."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Das Telefon konnte nicht auf dieses WLAN zugreifen."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Erweiterte WLAN-Einstellungen"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"WLAN-Frequenzband"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"Achtung: Das Tablet kann erst überprüfen, ob Ihre Software aktuell ist, wenn eine Internetverbindung besteht."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"Achtung: Das Telefon kann erst überprüfen, ob Ihre Software aktuell ist, wenn eine Internetverbindung besteht."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Das Tablet konnte nicht auf dieses WLAN zugreifen."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Das Telefon konnte nicht auf dieses WLAN zugreifen."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Erweiterte WLAN-Einstellungen"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"WLAN-Frequenzband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Frequenzbereich für Betrieb festlegen"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Fehler beim Festlegen des Frequenzbands"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-Adresse"</string>
@@ -634,7 +656,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Länge Netzwerkpräfix"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Geräte-Informationen"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Diese Verbindung speichern"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Nach Geräten suchen"</string>
@@ -650,13 +672,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Einladung ablehnen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Möchten Sie die Einladung zum Verbinden mit <xliff:g id="PEER_NAME">%1$s</xliff:g> ablehnen?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Diese Gruppe entfernen?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiler WLAN-Hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot wird aktiviert…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot wird deaktiviert…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobiler Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fehler beim mobilen WLAN-Hotspot"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"WLAN-Hotspot einrichten"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Fehler beim mobilen WLAN-Hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WLAN-Hotspot einrichten"</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="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
@@ -791,7 +813,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signalstärke"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Netzwerk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"WLAN-MAC-Adresse"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN-MAC-Adresse"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-Adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seriennummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nicht verfügbar"</string>
@@ -804,11 +826,11 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Verfügbar (schreibgeschützt)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Gesamtspeicher"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Wird berechnet..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (App-Daten und Medieninhalte)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Apps (Appdaten &amp; Medieninhalte)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Medien"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Downloads"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, Videos"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne, usw.)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"Audio (Musik, Töne usw.)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Sonstiges"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Daten im Cache"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Gemeinsamen Speicher trennen"</string>
@@ -880,6 +902,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN aktiviert"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN deaktiviert"</string>
     <string name="bearer" msgid="594270280031923558">"Träger"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-Typ"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-Wert"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN löschen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Neuer APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Speichern"</string>
@@ -956,9 +980,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hilfe"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilfunknetze"</string>
     <string name="location_title" msgid="1029961368397484576">"Mein Standort"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Standort per WLAN &amp; Mobilfunknetz"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"WLAN- &amp; Mobilfunknetz-Standort"</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="7457348712272184793">"Standort per WLAN bestimmt"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Standort per WLAN ermittelt"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-Satelliten"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Apps dürfen meinen Standort mithilfe von GPS auf meinem Tablet bestimmen."</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Apps dürfen meinen Standort mithilfe von GPS auf meinem Telefon bestimmen."</string>
@@ -968,7 +992,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Standort &amp; Google-Suche"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Google darf Suchergebnisse und andere Dienste an meinen Standort anpassen"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Zugriff auf meinen Standort"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Meine Standortinformationen dürfen von Apps verwendet werden, die ich dazu berechtigt habe."</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Meine Standortdaten dürfen von Apps verwendet werden, die ich dazu berechtigt habe."</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Standortquellen"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Über das Tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Über das Telefon"</string>
@@ -1083,6 +1107,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filteroptionen auswählen"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktiviert"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Heruntergeladen"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Aktiv"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-Speicher"</string>
@@ -1142,6 +1167,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Wenn Sie eine integrierte App deaktivieren, kann dies das Verhalten anderer Apps beeinträchtigen. Außerdem werden Ihre Daten gelöscht."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Benachrichtigungen deaktivieren?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Wenn Sie die Benachrichtigungen für diese App deaktivieren, verpassen Sie eventuell wichtige Warnmeldungen und Updates."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"App-Vorgänge"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Aktiv"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nie verwendet)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Speichernutzung"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Von Apps verwendeten Speicher anzeigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
@@ -1221,6 +1249,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Wort:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Tastaturkürzel:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Sprache:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Wort eingeben"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Optionale Verknüpfung"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Wort bearbeiten"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Bearbeiten"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Löschen"</string>
@@ -1261,8 +1291,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Einstellungen für physische Tastatur"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Entwickleroptionen"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Optionen zur App-Entwicklung festlegen"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Entwickleroptionen sind für diesen Nutzer nicht verfügbar."</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Autorisierungen für USB-Debugging aufheben"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Fehlerberichte im Menü \"Akku\""</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Fügt die Option für den Fehlerbericht im Menü \"Akku\" hinzu"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv lassen"</string>
@@ -1271,6 +1303,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Falsche Standorte zulassen"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Entwicklungseinstellungen zulassen?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Diese Einstellungen sind ausschließlich für Entwicklungszwecke geeignet. Sie können Ihr Gerät und die darauf installierten Apps beschädigen oder zu unerwünschtem Verhalten führen."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Apps über USB bestätigen"</string>
@@ -1307,7 +1340,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Bedienungshilfenverknüpfung"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"An"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Aus"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:"\n\n"1. Schritt: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren."\n\n"2. Schritt: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören."\n\n"Falls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Wenn diese Funktion aktiviert ist, können Sie Bedienungshilfen schnell in zwei Schritten aktivieren:"\n\n"Schritt 1: Drücken und halten Sie die Ein-/Austaste, bis Sie einen Ton hören oder eine Vibration spüren."\n\n"Schritt 2: Berühren und halten Sie mit zwei Fingern, bis Sie eine Audiobestätigung hören."\n\n"Falls das Gerät mehrere Nutzer hat, werden die Bedienungshilfen durch Verwendung dieser Verknüpfung in der Bildschirmsperre solange aktiviert, bis das Gerät entsperrt ist."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Großer Text"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Bildschirmvergrößerung"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Vergrößerung autom. aktualisieren"</string>
@@ -1315,23 +1348,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Ein/Aus beendet Anruf"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Passwörter aussprechen"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Reaktionszeit Berühren/Halten"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Web-Bedienung verbessern"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Einstellungen"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"An"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Aus"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Zugelassen"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nicht zugelassen"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Zulassen"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nicht zulassen"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g> verwenden?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich personenbezogener Daten wie Kreditkartennummern, jedoch keine Passwörter. Auch Daten bezüglich meiner Interaktion mit dem Tablet können erfasst werden."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kann den gesamten von Ihnen eingegebenen Text erfassen, einschließlich personenbezogener Daten wie Kreditkartennummern, jedoch keine Passwörter. Auch Daten bezüglich Ihrer Interaktion mit dem Telefon können erfasst werden."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g> beenden?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Durch Berühren von \"OK\" wird <xliff:g id="SERVICE">%1$s</xliff:g> beendet."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Ihre Aktionen beobachten"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Erhält Benachrichtigungen, wenn Sie mit einer App interagieren."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> anhalten?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Durch Berühren von \"OK\" wird <xliff:g id="SERVICE">%1$s</xliff:g> beendet."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Keine Dienste installiert"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Benötigen Sie einen Screenreader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack bietet blinden Nutzern und Nutzern mit eingeschränktem Sehvermögen gesprochenes Feedback. Möchten Sie diese Funktion kostenlos von Android Market installieren?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Dürfen Apps Skriptdateien von Google installieren, um Ihnen den Zugang zu ihren Inhalten zu erleichtern?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Es wurde keine Beschreibung bereitgestellt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Einstellungen"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
@@ -1345,14 +1373,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Wird geladen..."</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Bildschirm an"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktiv"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WLAN"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"WLAN"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilfunknetzsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"WLAN-Aktivzeit"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"WLAN-Aktivzeit"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"WLAN-Aktivzeit"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN-Aktivzeit"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Verlaufsdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Details zum Verbrauch"</string>
@@ -1360,7 +1388,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbrauch anpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Enthaltene Pakete"</string>
     <string name="power_screen" msgid="3023346080675904613">"Display"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"WLAN"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilfunk-Standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Anrufe"</string>
@@ -1370,7 +1398,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU Vordergrund"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Aktiv lassen"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WLAN aktiv"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN aktiv"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gesendete Daten"</string>
@@ -1383,7 +1411,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"App-Info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App-Einstellungen"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Bildschirmeinstellungen"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"WLAN-Einstellungen"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"WLAN-Einstellungen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-Einstellungen"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Akkuverbrauch durch Anrufe"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Akkuverbrauch in Ruhezustand"</string>
@@ -1392,8 +1420,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Flugmodus zum Energiesparen in Gebieten ohne Mobilfunkabdeckung"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Akkuverbrauch durch Display und Beleuchtung"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Display-Helligkeit und/oder Display-Timeout verringern"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Akkuverbrauch durch WLAN"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"WLAN bei Nichtverwendung oder Nichtverfügbarkeit deaktivieren"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Akkuverbrauch durch WLAN"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"WLAN bei Nichtverwendung oder Nichtverfügbarkeit deaktivieren"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Akkuverbrauch durch Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Bluetooth bei Nichtverwendung deaktivieren"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Mit einem anderen Bluetooth-Gerät verbinden"</string>
@@ -1439,6 +1467,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurieren"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Anderes Modul auswählen"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Dieses Sprachsynthesemodul kann den gesamten gesprochenen Text erfassen, einschließlich personenbezogener Daten wie Passwörter und Kreditkartennummern. Es ist Teil der App \"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>\". Möchten Sie dieses Sprachsynthesemodul aktivieren?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Für diese Sprache ist zur Text-in-Sprache-Ausgabe eine aktive Netzwerkverbindung erforderlich."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Module"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-Einstellungen"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ist aktiviert."</string>
@@ -1456,14 +1485,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Bevorzugtes Modul"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Allgemein"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiesteuerung"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualisieren der WLAN-Einstellung"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"WLAN-Einstellung wird aktualisiert..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualisieren der Bluetooth-Einstellung"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"an"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"aus"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"Wird aktiviert..."</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"Wird deaktiviert..."</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"WLAN"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"WLAN"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronisierung"</string>
@@ -1482,6 +1511,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauensw. Anmeldedaten"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate ansehen"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Speichertyp"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-gestützt"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Nur Software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1503,7 +1535,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sicherung &amp; Wiederherstellung"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personenbezogene Daten"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Meine Daten sichern"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"App-Daten, WLAN-Passwörter und andere Einstellungen auf Google-Servern 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="auto_restore_title" msgid="5397528966329126506">"Autom. Wiederherstellung"</string>
@@ -1515,7 +1547,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Das neue Passwort und die Bestätigung stimmen nicht überein."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Fehler beim Festlegen des Sicherungspassworts"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Sicherung Ihrer WLAN-Passwörter, Lesezeichen, anderer Einstellungen und App-Daten beenden und alle Kopien auf Google-Servern löschen?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Sicherung Ihrer WLAN-Passwörter, Lesezeichen, anderer Einstellungen und App-Daten beenden und alle Kopien auf Google-Servern löschen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Einstellungen für die Geräteverwaltung"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Geräteadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivieren"</string>
@@ -1531,10 +1563,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Benachrichtigungen"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Klingelton &amp; Vibration für Anrufe"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"WLAN-Einrichtung"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Mit WLAN-Netzwerk verbinden: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Verbinden mit WLAN <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"WLAN-Einrichtung"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Mit WLAN-Netzwerk verbinden: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Verbindung mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> wird hergestellt…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Netzwerk hinzufügen"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nicht verbunden"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Netzwerk hinzufügen"</string>
@@ -1556,9 +1588,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Verbindung wird hergestellt..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Weiter zum nächsten Schritt"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP wird nicht unterstützt."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter \"Drahtlos &amp; Netzwerke\" vornehmen."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Während der Einrichtung können Sie keine EAP-WLAN-Verbindung konfigurieren. Sie können dies anschließend in den Einstellungen unter \"Drahtlos &amp;amp Netzwerke\" vornehmen."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Der Verbindungsaufbau kann einige Minuten dauern..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tippen Sie auf "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren."\n\n"Tippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Berühren Sie "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren."\n\n"Tippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisierung aktiviert"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisierung deaktiviert"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisierungsfehler"</string>
@@ -1575,7 +1607,7 @@
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronisierung AN"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronisierung AUS"</string>
     <string name="sync_error" msgid="5060969083117872149">"Synchronisierungsfehler"</string>
-    <string name="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert am <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
+    <string name="last_synced" msgid="4242919465367022234">"Zuletzt synchronisiert: <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g>"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"Synchronisieren…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"Einstellungen sichern"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"Meine Einstellungen sichern"</string>
@@ -1626,6 +1658,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"App wartet vor der Ausführung auf den Start des Debuggers"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Eingabe"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Zeichnung"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardwarebeschleunigtes Rendering"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Überwachung"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strikter Modus aktiviert"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Bei längeren Aktionen im Hauptthread Bildschirm kurz einblenden"</string>
@@ -1643,11 +1676,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Niedrig nach hoch: blau, grün, hellrot, rot"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-Overlays deaktivieren"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Tracing aktivieren"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Aktivierte Traces wählen"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Keine Traces aktiviert"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> Traces aktiviert"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle Traces aktiviert"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-Traces aktivieren"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Layoutgrenzen einblenden"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clip-Begrenzungen, Ränder usw. anzeigen"</string>
@@ -1657,8 +1685,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Einsatz von GPU für 2D-Zeichnung erzwingen"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA erzwingen"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA in OpenGL ES 2.0-Apps aktivieren"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Nicht rechteckige Clip-Operationen debuggen"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU-Rendering für Profil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Rendering-Zeit in adb shell dumpsys gfxinfo messen"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Maßstab Fensteranimation"</string>
     <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>
@@ -1669,12 +1697,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Hintergrundprozesslimit"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Alle ANRS anzeigen"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Dialogfeld \"App antwortet nicht\" für Hintergrund-Apps anzeigen"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"WebView (experimentell)"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Apps verwenden neueste WebView-Version (Beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datenverbrauch"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Datenverbrauchszyklus"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Daten-Roaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hintergrunddaten beschränken"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-Nutzung separat anzeigen"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WLAN anzeigen"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"WLAN-Nutzung anzeigen"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-Nutzung anzeigen"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobile Hotspots"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Daten automatisch synchronisieren"</string>
@@ -1683,20 +1713,20 @@
     <string name="data_usage_empty" msgid="8621855507876539282">"Kein Datenverbrauch in diesem Zeitraum"</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Vordergrund"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Hintergrund"</string>
-    <string name="data_usage_app_restricted" msgid="3568465218866589705">"eingeschränkt"</string>
+    <string name="data_usage_app_restricted" msgid="3568465218866589705">"Eingeschränkt"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Mobilfunk deaktivieren?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limit festlegen"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G-Datenlimit festlegen"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-/3G-Datenlimit festlegen"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"WLAN-Datenlimit festlegen"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"WLAN"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"WLAN-Datenlimit festlegen"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"WLAN"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G/3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobil"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Keine"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilfunk"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiler Datenverkehr"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-/3G-Daten"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-Daten"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"App-Einstellungen anzeigen"</string>
@@ -1716,26 +1746,26 @@
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Übernehmen"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Warnung für Datenverbrauch festlegen"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limit festlegen"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrenzung des Datenverbrauchs"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datenverbrauch begrenzen"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Tablet berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Ihre mobile Datenverbindung wird deaktiviert, sobald das angegebene Limit erreicht ist."\n\n"Der Datenverbrauch wird von Ihrem Telefon berechnet und kann von der Abrechnung Ihres Mobilfunkanbieters abweichen. Ziehen Sie deshalb die Verwendung eines niedrigen Limits in Betracht."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hintergrunddaten beschränken?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Wenn Sie mobile Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei verfügbarer WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei verfügbarer WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Wenn Sie mobile Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Wenn Sie die mobilen Hintergrunddaten beschränken, funktionieren einige Apps und Dienste nur bei WLAN-Verbindung."\n\n"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"Warnung"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"-Limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Entfernte Apps"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Entfernte Apps und Nutzer"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> erhalten, <xliff:g id="SENT">%2$s</xliff:g> gesendet"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet. Abrechnung des Datenverbrauchs durch Tablet. Kann von Mobilfunkanbieter abweichen."</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verwendet. Abrechnung des Datenverbrauchs durch Telefon. Kann von Mobilfunkanbieter abweichen."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verbraucht. Abrechnung des Datenverbrauchs durch Tablet. Kann von Mobilfunkanbieter abweichen."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> verbraucht. Abrechnung des Datenverbrauchs durch Telefon. Kann von Mobilfunkanbieter abweichen."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobile Hotspots"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Wählen Sie die WLAN-Netzwerke aus, die mobile Hotspots sind. Die Verwendung dieser Netzwerke kann für Apps im Hintergrund eingeschränkt werden. Eventuell senden Apps auch eine Warnung, bevor diese Netzwerke für umfangreiche Downloads verwendet werden."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Wählen Sie die WLAN-Netzwerke aus, die mobile Hotspots sind. Die Verwendung dieser Netzwerke kann für Apps im Hintergrund eingeschränkt werden. Eventuell senden Apps auch eine Warnung, bevor diese Netzwerke für umfangreiche Downloads verwendet werden."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilfunknetze"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WLAN-Netzwerke"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Aktivieren Sie WLAN, um mobile Hotspots auszuwählen."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"WLAN-Netzwerke"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Aktivieren Sie WLAN, um mobile Hotspots auszuwählen."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Notruf"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Zurück zum Anruf"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
@@ -1793,34 +1823,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Moderat"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Strikt"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Nutzer"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Ich"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andere Nutzer"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Nutzer hinzufügen"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Nicht aktiv"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Nutzer &amp; Profile"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Nutzer oder Profil hinzufügen"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Eingeschränktes Profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Vor dem Erstellen eines eingeschränkten Profils müssen Sie eine Display-Sperre einrichten, um Ihre Apps und personenbezogenen Daten zu schützen."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Sperre einrichten"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nicht eingerichtet"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Eingeschränktes Profil nicht eingerichtet"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigentümer"</string>
+    <string name="user_you" msgid="1639158809315025986">"Ich (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Alias"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Hinzufügen"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Die Nutzer haben eigene Apps und Inhalte."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Sie können den Zugriff auf Apps und Inhalte aus Ihrem Konto beschränken."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Nutzer"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Eingeschränkte Profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Neuen Nutzer hinzufügen"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Sie können dieses Gerät mit anderen Personen teilen und dazu zusätzliche Nutzer erstellen. Jeder Nutzer hat seinen eigenen Bereich, in dem er unter anderem eigene Apps oder Hintergründe installieren kann. Nutzer können auch Tablet-Einstellungen wie WLAN anpassen, die jeden Nutzer betreffen."\n\n"Nachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen."\n\n"Jeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Sie können dieses Gerät mit anderen Personen teilen und dazu zusätzliche Nutzer erstellen. Jeder Nutzer hat seinen eigenen Bereich, in dem er unter anderem eigene Apps oder Hintergründe installieren kann. Nutzer können auch Tablet-Einstellungen wie WLAN anpassen, die jeden Nutzer betreffen."\n\n"Nachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen."\n\n"Jeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Nachdem Sie einen neuen Nutzer erstellt haben, muss dieser einen Einrichtungsprozess durchlaufen."\n\n"Jeder Nutzer kann aktualisierte App-Berechtigungen im Namen aller anderen Nutzer akzeptieren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nutzer jetzt einrichten?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Der Nutzer muss Zugang zu dem Tablet haben und seinen Speicherplatz einrichten."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil jetzt einrichten?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Jetzt einrichten"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nicht jetzt"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Nur der Besitzer des Tablets kann Nutzer verwalten."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Nur der Besitzer des Telefons kann Nutzer verwalten."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"In eingeschränkten Profilen können keine Konten hinzugefügt werden."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> vom Gerät löschen"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Neuer Nutzer"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Neues Profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Sich selbst löschen?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Nutzer entfernen?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Profil entfernen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ihr Profil und Ihre Daten werden vom Tablet entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ihr Profil und Ihre Daten werden vom Telefon entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Das Profil und die Daten dieses Nutzers werden vom Tablet entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Das Profil und die Daten dieses Nutzers werden vom Telefon entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Das Profil und die zugehörigen Daten werden vom Tablet entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Das Profil und die zugehörigen Daten werden vom Telefon entfernt. Sie können diese Aktion nicht rückgängig machen."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Neuer Nutzer wird hinzugefügt…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Nutzer löschen"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Löschen"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Diese Einstellung betrifft alle Nutzer auf diesem Tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Diese Einstellung betrifft alle Nutzer auf diesem Telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Sprache ändern"</string>
@@ -1831,4 +1877,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Beschränkungen für Apps und Inhalte"</string>
+    <string name="user_rename" msgid="8523499513614655279">"Umbenennen"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"App-Grenzen 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Änderungen an Bluetooth-Pairings und -Einstellungen zulassen"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Datenaustausch bei Kontakt mit anderen Geräten zulassen"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Standortzugriff"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Apps die Verwendung Ihrer Standortinformationen gestatten"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Zurück"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Weiter"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Fertig"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Foto aufnehmen"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Foto aus Galerie auswählen"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index f59025a..6a2ceb1 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Αργός"</item>
     <item msgid="1145554631248513562">"Κανονική"</item>
     <item msgid="7553665153391107454">"Γρήγορη"</item>
-    <item msgid="2538100882620724753">"Πολύ γρήγορος"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Καμία"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Κανένα"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Δεν έχει καθοριστεί"</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">"Εσωτερικός χώρος αποθήκευσης της συσκευής"</item>
     <item msgid="3738430123799803530">"Αφαιρούμενη κάρτα SD"</item>
     <item msgid="4498124044785815005">"Να αποφασίζει το σύστημα"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Τοποθεσία"</item>
+    <item msgid="255608127647030286">"Προσωπικό"</item>
+    <item msgid="4588829735729884491">"Ανταλλαγή μηνυμάτων"</item>
+    <item msgid="8971765125227378270">"Συσκευή"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"τοποθεσία κατά προσέγγιση"</item>
+    <item msgid="5789673140227507995">"ακριβής τοποθεσία"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"δόνηση"</item>
+    <item msgid="3434165993711230924">"ανάγνωση επαφών"</item>
+    <item msgid="616161687718081936">"τροποποίηση επαφών"</item>
+    <item msgid="7638002295329050091">"ανάγνωση αρχείου καταγραφής κλήσεων"</item>
+    <item msgid="6546959730920410907">"τροποποίηση αρχείου κλήσεων"</item>
+    <item msgid="446877710771379667">"ανάγνωση ημερολογίου"</item>
+    <item msgid="7674458294386319722">"τροποποίηση ημερολογίου"</item>
+    <item msgid="8281201165558093009">"σάρωση Wi-Fi"</item>
+    <item msgid="8694611243479480497">"ειδοποίηση"</item>
+    <item msgid="7776439107987345446">"σάρωση κυψέλης"</item>
+    <item msgid="514615766544675057">"κλήση τηλεφώνου"</item>
+    <item msgid="8181415497109310680">"ανάγνωση SMS"</item>
+    <item msgid="6816551144382117307">"σύνταξη SMS"</item>
+    <item msgid="4600463921908905030">"λήψη SMS"</item>
+    <item msgid="5958926493289432745">"λήψη SMS έκτακτης ανάγκης"</item>
+    <item msgid="4945269495221089540">"λήψη MMS"</item>
+    <item msgid="5570472453573929087">"λήψη μηνύματος push μέσω WAP"</item>
+    <item msgid="7125408150230860501">"αποστολή SMS"</item>
+    <item msgid="7080337936612188061">"ανάγνωση ICC SMS"</item>
+    <item msgid="587124103118495063">"σύνταξη ICC SMS"</item>
+    <item msgid="2320577158869025503">"τροποποίηση ρυθμίσεων"</item>
+    <item msgid="1545733463471924009">"μεταφορά στην κορυφή"</item>
+    <item msgid="3609046903962454582">"πρόσβαση στις ειδοποιήσεις"</item>
+    <item msgid="4671646036128214513">"κάμερα"</item>
+    <item msgid="1097324338692486211">"εγγραφή ήχου"</item>
+    <item msgid="5031552983987798163">"αναπαραγωγή ήχου"</item>
+    <item msgid="8374996688066472414">"ανάγνωση περιεχόμενων προχείρου"</item>
+    <item msgid="3045529469061083747">"τροποποίηση περιεχομένων προχείρου"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Τοποθεσία"</item>
+    <item msgid="8677040780775113033">"Τοποθεσία"</item>
+    <item msgid="1660743989948992916">"Τοποθεσία"</item>
+    <item msgid="8791172739860195290">"Δόνηση"</item>
+    <item msgid="383413555642128046">"Ανάγνωση επαφών"</item>
+    <item msgid="3654594895269697313">"Τροποποίηση επαφών"</item>
+    <item msgid="7928393476362362538">"Ανάγνωση αρχείου καταγραφής κλήσεων"</item>
+    <item msgid="6248591205254641116">"Τροποποίηση αρχείου κλήσεων"</item>
+    <item msgid="6093344633066170692">"Ανάγνωση ημερολογίου"</item>
+    <item msgid="1334886368750347692">"Τροποποίηση ημερολογίου"</item>
+    <item msgid="1638204101698708656">"Τοποθεσία"</item>
+    <item msgid="2154671955760380322">"Δημοσίευση ειδοποίησης"</item>
+    <item msgid="4282477730595931828">"Τοποθεσία"</item>
+    <item msgid="4891423912898525905">"Κλήση τηλεφώνου"</item>
+    <item msgid="626463821668200388">"Λήψη SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Αποστολή SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Λήψη SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Λήψη SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Λήψη SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Λήψη SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Αποστολή SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Λήψη SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Αποστολή SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Τροποποίηση ρυθμίσεων"</item>
+    <item msgid="736541391767350377">"Μεταφορά στην κορυφή"</item>
+    <item msgid="5530815681721654194">"Πρόσβαση στις ειδοποιήσεις"</item>
+    <item msgid="781213371706962767">"Κάμερα"</item>
+    <item msgid="1720492593061838172">"Ηχογράφηση"</item>
+    <item msgid="3493046322001257041">"Αναπαραγωγή ήχου"</item>
+    <item msgid="136815868796597058">"Ανάγνωση περιεχομένων προχείρου"</item>
+    <item msgid="5238692940326972503">"Τροποποίηση περιεχομένων προχείρου"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Σύντομο"</item>
     <item msgid="2560532955514699713">"Μεσαία"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Γραφικά)"</item>
     <item msgid="1340692776955662664">"Κλήση στοίβας σε glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"Στην οθόνη ως ράβδοι"</item>
+    <item msgid="8272260411216018353">"Στην οθόνη ως γραμμές"</item>
+    <item msgid="120512413928262547">"Σε adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Τυπικό όριο"</item>
     <item msgid="4071574792028999443">"Δεν υπάρχουν διεργασίες παρασκηνίου"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index e8ed41a..2af1d73 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -184,7 +184,7 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Διακομιστής μεσολάβησης παράκαμψης για"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Επαναφορά προεπιλογών"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Ολοκληρώθηκε"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Τέλος"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Όνομα κεντρικού υπολογιστή διακομιστή μεσολάβησης"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Προσοχή"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Λειτουργία πτήσης"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Περισσότερα ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Ασύρματο και δίκτυα"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Διαχείριση Wi-Fi, Bluetooth, λειτουργίας πτήσης, δικτύων κινητής τηλεφωνίας και VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Διαχείριση Wi-Fi, Bluetooth, λειτουργίας πτήσης, δίκτυα κινητής τηλεφωνίας και VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Περιαγωγή δεδομένων"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Σύνδεση στις υπηρεσίες δεδομένων κατά την περιαγωγή"</string>
@@ -279,7 +279,7 @@
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Όταν επιτρέπετε την περιαγωγή δεδομένων, ενδέχεται να ισχύσουν σημαντικές χρεώσεις περιαγωγής!"\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"Να επιτρέπεται η περιαγωγή δεδομένων;"</string>
     <string name="networks" msgid="6333316876545927039">"Επιλογή παρόχου"</string>
-    <string name="sum_carrier_select" msgid="3616956422251879163">"Επιλέξτε μια εταιρία δικτύου"</string>
+    <string name="sum_carrier_select" msgid="3616956422251879163">"Επιλέξτε μια εταιρεία δικτύου"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Ημερομηνία και ώρα"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Ορισμός ημερομηνίας και ώρας"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Ορισμός ημερομηνίας, ώρας, ζώνης ώρας και μορφές"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Εισάγετε κείμενο για εμφάνιση σε οθόνη κλειδώματος"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Εμφάνιση πληροφοριών χρήστη στην οθόνη κλειδώματος"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Πληροφορίες χρήστη"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Εμφάνιση πληροφοριών προφίλ στην οθόνη κλειδώματος"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Πληροφορίες προφίλ"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Πρόσβαση τοποθεσίας"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Ασφάλεια"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Διαχείριση συσκευής"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Διαχειριστές συσκευών"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Προβολή ή απενεργοποίηση των διαχειριστών συσκευής"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Πρόσβαση σε ειδοποιήσεις"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ενεργοποίηση Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Διατήρηση ρυθμίσεων"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Ασύρματη οθόνη"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Για να δείτε τις συσκευές, ενεργοποιήστε την ασύρματη οθόνη."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Η ασύρματη οθόνη έχει απενεργοποιηθεί επειδή το Wi-Fi είναι ανενεργό."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Η ασύρματη οθόνη έχει απενεργοποιηθεί επειδή το Wi-Fi είναι ανενεργό."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Αναζήτηση για οθόνες"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Αναζήτηση…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Δεν βρέθηκαν κοντινές ασύρματες οθόνες."</string>
@@ -517,57 +528,64 @@
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο αγγίζει μια άλλη συσκευή"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Έτοιμο για μετάδοση περιεχομένου εφαρμογής μέσω NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Έτοιμο για μετάδοση περιεχομένου εφαρμογής μέσω ΕΚΠ"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Απενεργοποίηση"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Δεν διατίθεται, επειδή η ΕΚΠ είναι απενεργοποιημένη"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Όταν αυτή η λειτουργία είναι απενεργοποιημένη, μπορείτε να μεταδώσετε περιεχόμενο εφαρμογών σε άλλη συσκευή με δυνατότητα ΕΚΠ, διατηρώντας τις συσκευές σε κοντινή απόσταση μεταξύ τους. Για παράδειγμα, μπορείτε να μεταδώσετε σελίδες του προγράμματος περιήγησης, βίντεο του YouTube, επαφές και άλλα."\n\n"Απλώς φέρετε τις συσκευές σε κοντινή απόσταση μεταξύ τους (συνήθως πλάτη με πλάτη) και, στη συνέχεια, αγγίξτε την οθόνη. Η εφαρμογή καθορίζει τι θα μεταδοθεί."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Όταν αυτή η λειτουργία ειναι ενεργοποιημένη, μπορείτε να μεταδώσετε περιεχόμενο εφαρμογών σε άλλη συσκευή με δυνατότητα ΕΚΠ, διατηρώντας τις συσκευές σε κοντινή απόσταση μεταξύ τους. Για παράδειγμα, μπορείτε να μεταδώσετε σελίδες του προγράμματος περιήγησης, βίντεο του 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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ενεργοποίηση Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Ρυθμίσεις Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ενεργοποίηση Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Ρυθμίσεις Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Επιλογή Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Ενεργοποίηση του Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Απενεργοποίηση του Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Επιλογή δικτύου Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Ενεργοποίηση του Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Απενεργοποίηση του Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Σφάλμα"</string>
     <string name="wifi_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="3038290727701553612">"Να ειδοποιούμαι όταν υπάρχει διαθέσιμο ανοικτό δίκτυο"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Αποφυγή κακών συνδέσεων"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν έχουν καλή σύνδεση στο Διαδίκτυο"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Να παραμένει ενεργοποιημένο το Wi-Fi κατά την αναστολή λειτουργίας"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Να μην γίνεται χρήση δικτύων Wi-Fi, εκτός αν υπάρχει καλή σύνδεση στο Διαδίκτυο"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Σάρωση πάντα διαθέσιμη"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Παροχή στην υπηρεσία εντοπισμού τοποθεσίας της Google και σε άλλες εφαρμογές, της δυνατότητας σάρωσης για δίκτυα, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Εγκατάσταση πιστοποιητικών"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Για τη βελτίωση της ακρίβειας και για άλλους σκοπούς, το Google και άλλες εφαρμογές ενδέχεται να πραγματοποιούν σάρωση για κοντινά δίκτυα Wi-Fi, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Οι εφαρμογές ενδέχεται να κάνουν σάρωση για κοντινά δίκτυα, ακόμη και αν το Wi-Fi είναι απενεργοποιημένο. Αν δεν επιθυμείτε να συμβαίνει αυτό, μεταβείτε στη ρύθμιση Σύνθετες &gt; Πάντα διαθέσιμη σάρωση."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Να μην εμφανιστεί ξανά"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Να παραμένει ενεργοποιημένο το Wi-Fi κατά την αναστολή λειτουργίας"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Προέκυψε κάποιο πρόβλημα κατά την αλλαγή της ρύθμισης"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Βελτιστοποίηση Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Ελαχιστοποίηση χρήσης μπαταρίας όταν το Wi-Fi είναι ενεργό"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Βελτιστοποίηση Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Ελαχιστοποίηση χρήσης μπαταρίας όταν το Wi-Fi είναι ενεργό"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Προσθήκη δικτύου"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Δίκτυα Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Δίκτυα Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Κουμπί WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Περισσότερες επιλογές"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Εισαγ. κωδ. Pin WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Διαγραφή δικτύου από τη μνήμη"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Τροποποίηση δικτύου"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Για να δείτε τα διαθέσιμα δίκτυα, ενεργοποιήστε το Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Αναζήτηση για δίκτυα Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Για διαθέσιμα δίκτυα, ενεργοποιήστε το Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Αναζήτηση για δίκτυα Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Δεν έχετε άδεια για αλλαγή του δικτύου Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Άλλο δίκτυο…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Περισσότερα"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Αυτόματη ρύθμιση (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Για να ολοκληρώσετε τη ρύθμιση, το tablet σας χρειάζεται πρόσβαση σε δίκτυο Wi-Fi. Μετά τη ρύθμιση, μπορείτε να κάνετε εναλλαγή μεταξύ δεδομένων κινητής τηλεφωνίας και δικτύου Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Για να ολοκληρώσετε τη ρύθμιση, το tablet σας χρειάζεται πρόσβαση σε δίκτυο Wi-Fi. Μετά τη ρύθμιση, μπορείτε να κάνετε εναλλαγή μεταξύ δεδομένων κινητής τηλεφωνίας και δικτύου Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Εμφάνιση σύνθετων επιλογών"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου Wi-Fi"</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="7204827509934892103">"Πατήστε ο κουμπί ρύθμισης προστατευόμενου Wi-Fi στον δρομολογητή σας. Ενδέχεται να ονομάζεται \"WPS\" ή να περιέχει αυτό το σύμβολο:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Εισαγάγετε το PIN <xliff:g id="NUMBER">%1$s</xliff:g> στον δρομολογητή σας Wi-Fi. Η ρύθμιση μπορεί να διαρκέσει έως και δύο λεπτά."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Πατήστε ο κουμπί ρύθμισης προστατευόμενου 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="5754399645462924103">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ίσως χρειαστούν έως και δύο λεπτά για να ολοκληρωθεί"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Αποτυχία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (WEP)"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Αποτυχία ελέγχου ταυτότητας. Προσπαθήστε ξανά."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Έχει εντοπιστεί μια άλλη συνεδρία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Δίκτυο SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Πληκτρολογήστε το SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ασφάλεια"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Ισχύς σήματος"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Κατάσταση"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ασφαλισμένα με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ασφαλισμένο με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Να επιτραπεί"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Απόρριψη"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Σύνδεση"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Να διαγραφεί από τη μνήμη"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Χωρίς παράλειψη"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας."\n\n"Η ρύθμιση του tablet μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: ενδέχεται να ισχύουν επιπλέον χρεώσεις από την εταιρεία κινητής τηλεφωνίας."\n\n"Η ρύθμιση του τηλεφώνου μπορεί να προκαλέσει μεγάλη δραστηριότητα δικτύου."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το tablet δεν θα είναι σε θέση να επαληθεύσει ότι το λογισμικό σας είναι ενημερωμένο."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: το τηλέφωνο δεν θα είναι σε θέση να επαληθεύσει ότι το λογισμικό σας είναι ενημερωμένο."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Δεν ήταν δυνατή η σύνδεση του tablet σε αυτό το δίκτυο Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Δεν ήταν δυνατή η σύνδεση του τηλεφώνου σε αυτό το δίκτυο Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Σύνθετο Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Ζώνη συχνοτήτων Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μέχρι να αποκτήσετε σύνδεση στο διαδίκτυο, το tablet δεν θα μπορεί να ελέγξει αν το λογισμικό είναι ενημερωμένο."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Μέχρι να αποκτήσετε σύνδεση στο διαδίκτυο, το τηλέφωνο δεν θα μπορεί να ελέγξει αν το λογισμικό είναι ενημερωμένο."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Δεν ήταν δυνατή η σύνδεση του tablet σε αυτό το δίκτυο Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Δεν ήταν δυνατή η σύνδεση του τηλεφώνου σε αυτό το δίκτυο Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Σύνθετο Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Ζώνη συχνοτήτων Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Προσδιορίστε το εύρος συχνότητας της λειτουργίας"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Πρόβλημα κατά τη ρύθμιση της ζώνης συχνότητας."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Διεύθυνση MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Πύλη"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Μήκος προθέματος δικτύου"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Στοιχεία συσκευής"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Απομνημόνευση αυτής της σύνδεσης"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Αναζήτηση συσκευών"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Διαγραφή αυτής της ομάδας;"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ενεργοποίηση σημείου πρόσβασης…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Απενεργοποίηση σημείου πρόσβασης…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Το φορητό σημείο πρόσβασης <xliff:g id="NETWORK_SSID">%1$s</xliff:g> είναι ενεργό"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Σφάλμα φορητού σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Ρύθμιση φορητού σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Σφάλμα φορητού σημείου πρόσβασης Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Ρύθμιση φορητού σημείου πρόσβασης Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
@@ -727,12 +749,12 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Κατά τη σύνδεση"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Απενεργοποίηση"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Για να ελέγξετε τι συμβαίνει όταν το τηλέφωνο είναι συνδεδεμένο ή/και σε κατάσταση αδράνειας, ενεργοποιήστε τη λειτουργία Daydream."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Πότε να χρησιμοποιείται η εφαρμογή Daydream"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Πότε να ενεργοποιείται"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Έναρξη τώρα"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ρυθμίσεις"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
-    <string name="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειρ."</string>
+    <string name="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειράς"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Ρυθμίσεις κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_category" msgid="5136244267576697004">"Ορισμός κλειδώματος κάρτας SIM"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Κλείδωμα κάρτας SIM"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Ισχύς σήματος"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Περιαγωγή"</string>
     <string name="status_operator" msgid="2274875196954742087">"Δίκτυο"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Διεύθυνση MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Διεύθυνση MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Διεύθυνση Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Σειριακός αριθμός"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Μη διαθέσιμο"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Το APN έχει ενεργοποιηθεί"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Απενεργοποιημένο APN"</string>
     <string name="bearer" msgid="594270280031923558">"Φορέας"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Τύπος MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Τιμή MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Διαγραφή APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Νέο APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Αποθ/ση"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Βοήθεια"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Δίκτυα κινητής τηλεφωνίας"</string>
     <string name="location_title" msgid="1029961368397484576">"Η τοποθεσία μου"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Τοποθ. Wi-Fi&amp;δικτ.κιν.τηλ."</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρ.σε εφαρμ.να χρησ.την υπηρεσία τοποθ.της Google για γρήγ.εκτίμ.τοποθ. Θα συλλ.ανών.δεδομ.τοποθ.και θα αποστ.στην Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Τοποθεσία Wi‑Fi και δικτύων κιν. τηλεφ."</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Δορυφόροι GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Να επιτρέπεται στις εφαρμογές η χρήση του GPS στο tablet σας για την επισήμανση της τοποθεσίας σας"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Να επιτρέπεται στις εφαρμογές η χρήση του GPS στο τηλέφωνό σας για την επισήμανση της τοποθεσίας σας"</string>
@@ -1044,9 +1068,9 @@
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Προεπιλογές"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Συμβατότητα οθόνης"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Άδειες"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"Προσωρινή μνήμη"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Κρυφή μνήμη"</string>
     <string name="clear_cache_btn_text" msgid="5756314834291116325">"Εκκαθάριση προσωρινής μνήμης"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"Προσωρινή μνήμη"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Κρυφή μνήμη"</string>
     <string name="controls_label" msgid="7611113077086853799">"Στοιχεία ελέγχου"</string>
     <string name="force_stop" msgid="7435006169872876756">"Αναγκαστική διακοπή"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Σύνολο"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Φίλτρο"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Επιλογές φίλτρου"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Όλα"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Απενεργοποιημένες"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Η λήψη ολοκληρώθηκε"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Εκτελείται"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Αποθ. χώρος USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Εάν απενεργοποιήσετε μια ενσωματωμένη εφαρμογή, οι άλλες εφαρμογές ενδέχεται να μην λειτουργούν σωστά. Τα δεδομένα σας θα διαγραφούν επίσης."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Απενεργοποίηση ειδοποιήσεων;"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Εάν απενεργοποιήσετε τις ειδοποιήσεις για αυτήν την εφαρμογή, ενδέχεται να χάσετε σημαντικές ειδοποιήσεις και ενημερώσεις."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Λειτουργίες εφαρμογών"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Σε εκτέλεση"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Δεν έχει χρησιμοποιηθεί ποτέ)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Αποθηκευτικός χώρος"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Προβολή χώρου αποθήκευσης που χρησιμοποιείται από τις εφαρμογές"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Υπηρεσίες που εκτελούνται"</string>
@@ -1181,7 +1209,7 @@
     <string name="language_settings" msgid="5292716747264442359">"Γλώσσα και εισαγωγή"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Γλώσσα και εισαγωγή"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ρυθμίσεις γλώσσας"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Πληκτρολόγιο &amp; μέθοδοι εισόδου"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Πληκτρολογιο &amp; μεθοδοι εισοδου"</string>
     <string name="phone_language" msgid="8870144109924299673">"Γλώσσα"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Αυτόματη αντικατάσταση"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Λέξη:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Συντόμευση:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Γλώσσα:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Πληκτρολογήστε μια λέξη"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Προαιρετική συντόμευση"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Επεξεργασία λέξης"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Επεξεργασία"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Διαγραφή"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ρυθμίσεις φυσικού πληκτρολογίου"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Επιλογές για προγραμματιστές"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Οι επιλογές για προγραμματιστές δεν είναι διαθέσιμες για αυτόν το χρήστη"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Ανάκληση εξουσιοδοτήσεων εντοπισμού σφαλμάτων USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Αναφορές σφαλμάτων μενού λειτουργίας"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Συμπερίληψη επιλογής στο μενού λειτουργίας για λήψη αναφοράς σφαλμάτων"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Παραμονή σε κανονική κατάσταση λειτουργίας"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Να επιτρέπεται η χρήση των ρυθμίσεων ανάπτυξης;"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Αυτές οι ρυθμίσεις προορίζονται για χρήση κατά την ανάπτυξη. Μπορούν να προκαλέσουν προβλήματα στη λειτουργία της συσκευής και των εφαρμογών σας."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Επαλήθευση εφαρμογών μέσω USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Το κουμπί λειτ. τερμ. την κλήση"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Εκφώνηση κωδικών πρόσβασης"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Καθυστέρηση παρατετ. αγγίγματος"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Βελτίωση προσβασιμότητας στον ιστό"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ρυθμίσεις"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ενεργή"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ανενεργή"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Επιτρέπεται"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Δεν επιτρέπεται"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Να επιτραπεί"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Να μην επιτρέπεται"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Χρήση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Η υπηρεσία <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> μπορεί να συλλέξει όλο το κείμενο που πληκτρολογείτε, εκτός από τους κωδικούς πρόσβασης. Αυτό περιλαμβάνει προσωπικά δεδομένα όπως αριθμούς πιστωτικών καρτών. Μπορεί επίσης να συλλέξει δεδομένα σχετικά με τις αλληλεπιδράσεις σας με το tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Η υπηρεσία <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> μπορεί να συλλέξει όλο το κείμενο που πληκτρολογείτε, εκτός από τους κωδικούς πρόσβασης. Αυτό περιλαμβάνει προσωπικά δεδομένα όπως αριθμούς πιστωτικών καρτών. Μπορεί επίσης να συλλέξει δεδομένα σχετικά με τις αλληλεπιδράσεις σας με το τηλέφωνο."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Διακοπή <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Αγγίξτε το OK για να διακοπεί η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Παρατήρηση των ενεργειών σας"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Λήψη ειδοποιήσεων κατά την αλληλεπίδρασή σας με μια εφαρμογή."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Διακοπή <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Αγγίξτε το OK, για να διακοπεί η υπηρεσία <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Δεν έχουν εγκατασταθεί υπηρεσίες"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Χρειάζεστε έναν αναγνώστη οθόνης;"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Το TalkBack παρέχει σχόλια σε μορφή ομιλίας για να διευκολύνει χρήστες με προβλήματα όρασης. Θέλετε να το εγκαταστήσετε δωρεάν από το Android Market;"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Θέλετε να οι εφαρμογές να εγκαταστήσουν σενάρια από την Google που διευκολύνουν την πρόσβαση στο περιεχόμενο ιστού που έχουν;"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Δεν υπάρχει περιγραφή."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ρυθμίσεις"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Μπαταρία"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Φόρτιση"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Οθόνη ενεργοποιημένη"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ενεργοποιημένο"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Κανον. λειτ."</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Σήμα δικτύου κιν. τηλεφ."</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Χρόνος ενεργοποίησης της συσκευής"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi στην ώρα του"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi στην ώρα του"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi στην ώρα του"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi στην ώρα του"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Λεπτομέρειες ιστορικού"</string>
     <string name="details_title" msgid="3792801565213935385">"Λεπτομέρειες χρήσης"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Προσαρμογή χρήσης ισχύος"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Συμπεριλαμβανόμενα πακέτα"</string>
     <string name="power_screen" msgid="3023346080675904613">"Οθόνη"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Ετοιμότητα κυψέλης"</string>
     <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Προσκήνιο CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Διατήρηση λειτουρ."</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Το Wi-Fi είναι ενεργοποιημένο"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Το Wi-Fi είναι ενεργό"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Τηλέφωνο"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Τα δεδομένα εστάλησαν"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Πληροφορίες εφαρμογής"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ρυθμίσεις εφαρμογής"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ρυθμίσεις οθόνης"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Ρυθμίσεις Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Ρυθμίσεις Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ρυθμίσεις Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Μπαταρία που χρησιμοποιείται από φωνητικές κλήσεις"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Χρήση μπαταρίας όταν το tablet είναι σε αδράνεια"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Μετάβαση στη λειτουργία πτήσης για εξοικονόμηση ενέργειας σε περιοχές που προσφέρουν κάλυψη κυψέλης"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Μπαταρία που χρησιμοποιείται από την προβολή και το φωτισμό φόντου"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Μείωση φωτεινότητας οθόνης και/ή χρονικού ορίου οθόνης"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Μπαταρία που χρησιμοποιείται από το Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Απενεργοποίηση του Wi-Fi όταν δεν χρησιμοποιείται ή όταν δεν είναι διαθέσιμο"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Μπαταρία που χρησιμοποιείται από το Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Απενεργοποίηση του Wi-Fi όταν δεν χρησιμοποιείται ή όταν δεν είναι διαθέσιμο"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Μπαταρία που χρησιμοποιείται από το Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Απενεργοποιείτε το Bluetooth όταν δεν το χρησιμοποιείτε"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Δοκιμή σύνδεσης σε διαφορετική συσκευή Bluetooth"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Διαμόρφωση"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Επιλέξτε μια άλλη μηχανή"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Αυτή η μηχανή σύνθεσης ομιλίας μπορεί να συγκεντρώσει όλο το κείμενο που θα εκφωνηθεί, συμπεριλαμβανομένων προσωπικών δεδομένων όπως οι κωδικοί πρόσβασης και οι αριθμοί πιστωτικών καρτών. Προέρχεται από τη μηχανή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Να ενεργοποιηθεί η μηχανή σύνθεσης ομιλίας;"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Αυτή η γλώσσα απαιτεί μια ενεργή σύνδεση δικτύου για τη μετατροπή κειμένου σε ομιλία."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Μηχανές"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ρυθμίσεις <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Η επιλογή <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> είναι ενεργοποιημένη"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Προτεινόμενη μηχανή"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Γενικά"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Έλεγχος ισχύος"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ενημέρωση ρύθμισης Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ενημέρωση ρύθμισης Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ενημέρωση ρύθμισης Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ενεργή"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"απενεργοποιημένη"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ενεργοποίηση"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"απενεργοποίηση"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Συγχρονισμός"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Κατάργηση όλων των πιστοποιητικών"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Αξιόπιστα διαπιστευτήρια"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Προβολή αξιόπιστων πιστοποιητικών CA"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Τύπος αποθήκευσης"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Με υποστήριξη εξοπλισμού"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Μόνο λογισμικό"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Δημιουργία αντιγράφου ασφαλείας και επαναφορά"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Προσωπικά δεδομένα"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Δημιουργία αντιγράφων ασφαλείας για τα δεδομένα μου"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Δημιουργία αντιγράφων ασφαλείας για τα δεδομένα εφαρμογών, τους κωδικούς πρόσβασης Wi-Fi και για άλλες ρυθμίσεις, στους διακομιστές Google"</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="auto_restore_title" msgid="5397528966329126506">"Αυτόματη επαναφορά"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Ο νέος κωδικός πρόσβασης και η επιβεβαίωση δεν ταιριάζουν"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Αποτυχία κατά τον ορισμό εφεδρικού κωδικού πρόσβασης"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Θέλετε να διακοπεί η δημιουργία αντιγράφων ασφαλείας για τους κωδικούς πρόσβασης Wi-Fi, τους σελιδοδείκτες και τις άλλες ρυθμίσεις και τα δεδομένα εφαρμογών και να διαγραφούν όλα τα αντίτυπα από τους διακομιστές της Google;"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Θέλετε να διακοπεί η δημιουργία αντιγράφων ασφαλείας για τους κωδικούς πρόσβασης Wi-Fi, τους σελιδοδείκτες και τις άλλες ρυθμίσεις και τα δεδομένα εφαρμογών και να διαγραφούν όλα τα αντίτυπα από τους διακομιστές της Google;"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ρυθμίσεις διαχείρισης συσκευής"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Διαχειριστής συσκευής"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Απενεργοποίηση"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Ειδοποιήσεις"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ήχος κλήσης και δόνηση"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Σύστημα"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Ρύθμιση Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Συνδέθηκε στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Ρύθμιση Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Σύνδεση στο δίκτυο Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Σύνδεση σε δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Προσθήκη δικτύου"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Δεν συνδέθηκε"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Προσθήκη δικτύου"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Γίνεται σύνδεση..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Μετάβαση στο επόμενο βήμα"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Το EAP δεν υποστηρίζεται."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Δεν είναι δυνατή η διαμόρφωση σύνδεσης EAP Wi-Fi κατά τη διάρκεια της εγκατάστασης. Μετά την εγκατάσταση, μπορείτε να τη διαμορφώσετε από το στοιχείο Ρυθμίσεις &gt; Ασύρματο και Δίκτυα."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Δεν είναι δυνατή η διαμόρφωση σύνδεσης EAP Wi-Fi κατά τη διάρκεια της εγκατάστασης. Μετά την εγκατάσταση, μπορείτε να τη διαμορφώσετε από το στοιχείο Ρυθμίσεις &gt; Ασύρματο και δίκτυα."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Η σύνδεση μπορεί να διαρκέσει αρκετά λεπτά..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση."\n\n"Αγγίξτε το στοιχείο "<b>"Πίσω"</b>" για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση."\n\n"Αγγίξτε το στοιχείο "<b>"Πίσω"</b>"για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ενεργοποιημένος συγχρονισμός"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Συγχρονισμός είναι απενεργοποιημένος"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Σφάλμα συγχρονισμού."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Αναμονή εφαρμογής για να συνδεθεί ο εντοπισμός σφαλμάτων"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Εισαγωγή"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Σχέδιο"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Απόδοση με επιτάχυνση από υλικό εξοπλισμό"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Παρακολούθηση"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Ενεργ. αυστηρής λειτουργ."</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Αναβ. οθόνη σε εκτέλεση μεγάλων λειτ.σε κύριο νήμα"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Από το καλύτερο στο χειρότερο: μπλε, πράσινο, απαλό κόκκινο, κόκκινο"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Απενεργ. επικαλύψεων HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Ενεργοποίηση ιχνών"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Επιλ. ενεργ. ιχνών"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Δεν υπάρχουν ενεργοποιημένα ίχνη την τρέχουσα στιγμή"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> ίχνη είναι ενεργοποιημένα την τρέχουσα στιγμή"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Όλα τα ίχνη είναι επί του παρόντος ενεργοποιημένα"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ενεργοποίηση ιχνών OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Εμφάνιση ορίων διάταξης"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Εμφάνιση ορίων κλιπ, περιθωρίων, κλπ."</string>
@@ -1656,11 +1684,11 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Αναγκαστική χρήση του GPU για σχέδιο 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Αναγκαστικά 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Ενεργοποίηση 4x MSAA σε εφαρμογές OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Εντοπισμός σφαλμάτων σε λειτουργίες μη ορθογώνιας περιοχής"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Απόδοση GPU προφίλ"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Μέτρ. χρόνου απόδοσης σε adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Κλίμακα κίνησης παραθύρου"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Κλίμακα κίνησης μετάβασης"</string>
-    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Κλίμ. διάρ. Animator"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"Προσομ. δευτερ. προβολών"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"Εφαρμογές"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Μη διατήρ. δραστηριοτήτων"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Όριο διεργασ. παρασκηνίου"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Εμφάνιση όλων των ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Εμφ.του παραθ. \"Η εφαρμ.δεν αποκρ.\" για εφ.παρασκ."</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Χρήση πειραμ. προβ. ιστού"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Οι εφαρμ. θα χρησιμ. τη νέα (beta) προβολή ιστου"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Χρήση δεδομένων"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Κύκλος δεδομένων χρήσης"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Περιαγωγή δεδομένων"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Περιορισμός δεδομένων παρασκηνίου"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ξεχωριστή χρήση 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Εμφάνιση χρήσης Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Εμφάνιση χρήσης Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Εμφάνιση χρήσης Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Σημεία πρόσβασης για κιν."</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Αυτόματος συγχρονισμός δεδομένων"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ορισμός ορίου δεδομένων κινητού"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Ορισμός ορίου δεδομένων 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Ορισμός ορίου δεδομένων 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Ορισμός ορίου δεδομένων Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ορισμός ορίου δεδομένων Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Κινητό"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το tablet σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, καλό θα ήταν να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Η σύνδεση των δεδομένων του κινητού τηλεφώνου σας θα απενεργοποιηθεί μόλις συμπληρωθεί το καθορισμένο όριο."\n\n"Επειδή η χρήση δεδομένων υπολογίζεται από το τηλέφωνό σας και ενδέχεται η εταιρεία κινητής τηλεφωνίας να την υπολογίζει με διαφορετικό τρόπο, σκεφτείτε το ενδεχόμενο να χρησιμοποιήσετε ένα συντηρητικό όριο."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Περιορ.δεδομ.παρασκην.;"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Αν περιορίσετε τα δεδομένα παρασκηνίου κινητής τηλεφωνίας, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν εκτός και αν έχετε συνδεθεί σε δίκτυο Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Αν περιορίσετε τα δεδομένα παρασκηνίου κινητής τηλεφωνίας, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν εκτός και αν έχετε συνδεθεί σε δίκτυο Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Αν περιορίσετε τη χρήση των δεδομένων κινητής τηλεφωνίας στο παρασκήνιο, ορισμένες εφαρμογές και υπηρεσίες δεν θα λειτουργούν, εκτός εάν είστε συνδεδεμένοι σε δίκτυο Wi-Fi."\n\n"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες που χρησιμοποιούν το συγκεκριμένο τηλέφωνο."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">" <xliff:g id="NUMBER">^1</xliff:g> "</font>" "<font size="9">" <xliff:g id="UNIT">^2</xliff:g> "</font>" "\n" "<font size="12">" προειδοποίηση "</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"όριο"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Εφαρμογές που καταργήθηκαν"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: χρησιμοπ. <xliff:g id="TOTAL">%1$s</xliff:g>, βάσει tablet. Ο υπολογισμός χρήσης του δικτύου σας ίσως διαφέρει."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: χρησιμοπ. <xliff:g id="TOTAL">%1$s</xliff:g>, βάσει μέτρησης. Ο υπολογ. χρήσης του δικτύου σας ίσως διαφέρει."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Σημεία πρόσβασης για κιν."</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Επιλέξτε τα δίκτυα Wi-Fi που αποτελούν σημεία πρόσβασης για κινητά. Η χρήση αυτών των δικτύων από τις εφαρμογές μπορεί να αποκλειστεί όταν βρίσκονται στο παρασκήνιο. Οι εφαρμογές μπορεί επίσης να προειδοποιούν πριν από τη χρήση αυτών των δικτύων για μεγάλες λήψεις."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Επιλέξτε τα δίκτυα Wi-Fi που αποτελούν σημεία πρόσβασης για κινητά. Η χρήση αυτών των δικτύων από τις εφαρμογές μπορεί να αποκλειστεί όταν βρίσκονται στο παρασκήνιο. Οι εφαρμογές μπορεί επίσης να προειδοποιούν πριν από τη χρήση αυτών των δικτύων για μεγάλες λήψεις."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Δίκτυα κινητής τηλεφωνίας"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Δίκτυα Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Για επιλογή σημ. πρόσβ. για κινητά, ενεργοποιήστε το Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Δίκτυα Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Για επιλογή σημείων πρόσβασης για κινητά ενεργοποιήστε το Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Κλήση έκτακτης ανάγκης"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Επιστροφή στην κλήση"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Όνομα"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Ανεκτικό"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Επιβολή"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Χρήστες"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Εσείς"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Άλλοι χρήστες"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Προσθήκη χρήστη"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Ενεργός"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Μη ενεργός"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Χρήστες και προφίλ"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Προσθήκη χρήστη ή προφίλ"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Προφίλ περιορισμένης πρόσβασης"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Προκειμένου να μπορέσετε να δημιουργήσετε ένα περιορισμένο προφίλ, θα πρέπει να δημιουργήσετε ένα κλείδωμα οθόνης για την προστασία των εφαρμογών και των προσωπικών δεδομένων σας."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Ορισμός κλειδώματος"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Δεν υπάρχει ρύθμιση"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Δεν έχει ρυθμιστεί - Προφίλ περιορισμένης πρόσβασης"</string>
     <string name="user_owner" msgid="3879126011135546571">"Κάτοχος"</string>
+    <string name="user_you" msgid="1639158809315025986">"Εσείς (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Ψευδώνυμο"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Προσθήκη"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Οι χρήστες διαθέτουν τις δικές τους εφαρμογές και περιεχόμενο"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Μπορείτε να περιορίσετε την πρόσβαση σε εφαρμογές και περιεχόμενο από το λογαριασμό σας"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Χρήστης"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Προφίλ περιορ. πρόσβασης"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Προσθήκη νέου χρήστη"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Μπορείτε να μοιραστείτε αυτή τη συσκευή με άλλους χρήστες δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης διαθέτει τον δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, την ταπετσαρία και ούτω καθεξής. Οι χρήστες μπορούν επίσης να προσαρμόσουν τις ρυθμίσεις tablet όπως το Wi-Fi που επηρεάζουν τους πάντες."\n\n"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης."\n\n"Οποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους των άλλων χρηστών."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Μπορείτε να μοιραστείτε αυτή τη συσκευή με άλλους χρήστες δημιουργώντας επιπλέον χρήστες. Κάθε χρήστης διαθέτει τον δικό του χώρο, τον οποίο μπορεί να προσαρμόσει με τις δικές του εφαρμογές, την ταπετσαρία και ούτω καθεξής. Οι χρήστες μπορούν επίσης να προσαρμόσουν τις ρυθμίσεις tablet όπως το Wi-Fi που επηρεάζουν τους πάντες."\n\n"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης."\n\n"Οποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους άλλων χρηστών."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Αφού δημιουργήσετε έναν νέο χρήστη, αυτό το άτομο θα πρέπει να ολοκληρώσει τη διαδικασία ρύθμισης."\n\n"Οποιοδήποτε χρήστης μπορεί να αποδεχτεί ενημερωμένα δικαιώματα εφαρμογών εκ μέρους των άλλων χρηστών."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Να γίνει ρύθμιση χρήστη τώρα;"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Βεβαιωθείτε ότι ο χρήστης έχει τη δυνατότητα να ρυθμίσει το χώρο του στο tablet"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Να γίνει ρύθμιση προφίλ τώρα;"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Ρύθμιση τώρα"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Όχι τώρα"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Μόνο ο κάτοχος του tablet μπορεί να διαχειριστεί χρήστες."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Μόνο ο κάτοχος του τηλεφώνου μπορεί να διαχειριστεί χρήστες."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Δεν είναι δυνατή η προσθήκη λογαριασμών από περιορισμένα προφίλ"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Διαγρ. <xliff:g id="USER_NAME">%1$s</xliff:g> από τη συσκ."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Νέος χρήστης"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Νέο προφίλ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Διαγραφή του εαυτού σας;"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Κατάργηση χρήστη;"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Κατάργηση προφίλ;"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Θα χάσετε τον χώρο και τα δεδομένα σας σε αυτό το tablet. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Θα χάσετε τον χώρο και τα δεδομένα σας σε αυτό το τηλέφωνο. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Ο χώρος και τα δεδομένα αυτού του χρήστη θα εξαφανιστούν από αυτό το tablet. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Ο χώρος και τα δεδομένα αυτού του χρήστη θα εξαφανιστούν από αυτό το τηλέφωνο. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Ο χώρος και τα δεδομένα αυτού του προφίλ θα εξαφανιστούν από το tablet. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Ο χώρος και τα δεδομένα αυτού του προφίλ θα εξαφανιστούν από το τηλέφωνο. Δεν είναι δυνατό να αναιρέσετε αυτήν την ενέργεια."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Προσθήκη νέου χρήστη…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Διαγραφή χρήστη"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Διαγραφή"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Επέκταση ρυθμίσεων για εφαρμ."</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Αυτή η ρύθμιση επηρεάζει όλους τους χρήστες στο συγκεκριμένο tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Αυτή η χρήση επηρεάζει όλους τους χρήστες στο συγκεκριμένο τηλέφωνο."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Αλλαγή γλώσσας"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Αναγνωριστικό φωτογραφίας"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Εκπομπές κινητής τηλεφωνίας"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Επιλέξτε τους τύπους ειδοποιήσεων έκτακτης ανάγκης που θα εμφανίζονται."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Περιορισμοί εφαρμογών, περιεχομένου"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ΜΕΤΟΝΟΜΑΣΙΑ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Ορισμός ορίων εφαρμογής"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi και κινητά"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Να επιτρέπεται η τροποποίηση των ρυθμίσεων Wi‑Fi και κινητών"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Να επιτρέπεται η τροποποίηση των συζεύξεων και των ρυθμίσεων Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το tablet έρχεται σε επαφή με μια άλλη συσκευή"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Να επιτρέπεται η ανταλλαγή δεδομένων όταν το τηλέφωνο έρχεται σε επαφή με μια άλλη συσκευή"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Πρόσβαση τοποθεσίας"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Να επιτρέπεται στις εφαρμογές η χρήση των στοιχείων τοποθεσίας σας"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Πίσω"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Επόμενο"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Τέλος"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Λήψη φωτογραφίας"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Επιλογή φωτογραφιών από τη Συλλογή"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 79ecf36..6576fa7 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Slow"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Fast"</item>
-    <item msgid="2538100882620724753">"Very 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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <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>
@@ -206,11 +218,89 @@
     <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="8971765125227378270">"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>
+  </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="626463821668200388">"Receive SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Send 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="1530132603376027248">"Receive SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Send 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>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Short"</item>
     <item msgid="2560532955514699713">"Medium"</item>
@@ -266,6 +356,17 @@
     <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="8272260411216018353">"On screen as lines"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard limit"</item>
     <item msgid="4071574792028999443">"No background processes"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 60bf3e6..eca23ef 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"More…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; networks"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Manage Wi-Fi, Bluetooth, aeroplane mode, mobile networks &amp; VPNs"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Connect to data services when roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Connect to data services when roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"User info"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Show profile info on lock screen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Location access"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Device administration"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Device administrators"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"View or deactivate device administrators"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Turn on Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Wireless display"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"To see devices, turn wireless display on."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wireless display is disabled because Wi-FI is off."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wireless display is disabled because Wi‑Fi is off."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Search for displays"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Searching…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No nearby wireless displays were found."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"When this feature is turned on, you can beam app content to another NFC-capable device by holding the devices close together. For example, you can beam Browser pages, YouTube videos, People contacts and more."\n\n"Just bring the devices together (typically back to back) and then touch your screen. The app determines what gets beamed."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Network service discovery"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Allow apps on other devices to discover apps on this device"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Turn on Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi settings"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Turn on Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi settings"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Set up &amp; manage wireless access points"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Select Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Turning on Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Turning off Wi-Fi…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Select Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Turning Wi‑Fi on…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Turning off Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Error"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In aeroplane mode"</string>
     <string name="wifi_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="3038290727701553612">"Notify me when an open network is available"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Don\'t use a WiFi network unless it has a good Internet connection"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Keep Wi-Fi on during sleep"</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_scan_always_available" msgid="3470564139944368030">"Scanning always available"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Let Google\'s location service and other apps scan for networks, even when Wi-Fi is off"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Install certificates"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Don\'t show again"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Keep Wi‑Fi on during sleep"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-FI optimisation"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimise battery usage when Wi-FI is on"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi‑Fi optimisation"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimise battery usage when Wi‑Fi is on"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi networks"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi networks"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"More options"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Entry"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Scan"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Advanced"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"To see networks available, turn Wi-Fi on."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Searching for WiFi networks..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"To see available networks, turn Wi‑Fi on."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Searching for Wi‑Fi networks…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"You don\'t have permission to change the Wi‑Fi network."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"More"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"To complete setup, your tablet needs access to Wi-Fi. After setup, you can switch between mobile data and Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"To complete setup, your tablet needs access to Wi‑Fi. After setup, you can switch between mobile data and Wi‑Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Show advanced options"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</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="7204827509934892103">"Press the WiFi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Enter pin <xliff:g id="NUMBER">%1$s</xliff:g> on your Wi-Fi router. The setup may take up to two minutes to complete."</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_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="5754399645462924103">"Connected to the Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Connected to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS is already in progress and can take up to two minutes to complete"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Request failed. Please try again in a few minutes."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"The wireless router security setting (WEP) is not supported"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authentication failure. Please try again."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Another WPS session was detected. Please try again in a few minutes."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Enter the SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Security"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signal strength"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Allow this for all apps that want to scan?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Deny"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connect"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Failed to connect to network"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Forget"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Don\'t skip"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"WARNING: You may incur extra carrier data charges."\n\n"Tablet setup can require significant network activity."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WARNING: You may incur extra carrier data charges."\n\n"Phone setup can require significant network activity."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"WARNING: The tablet won\'t be able to verify that your software is up to date."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"WARNING: The phone won\'t be able to verify that your software is up to date."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"The tablet was unable to connect to this Wi-Fi network."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"The phone was unable to connect to this Wi-Fi network."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Advanced Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frequency band"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"WARNING: Until you have an internet connection, the tablet won\'t be able to verify that your software is up to date."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"WARNING: Until you have an internet connection, the phone won\'t be able to verify that your software is up to date."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"The tablet was unable to connect to this Wi‑Fi network."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"The phone was unable to connect to this Wi‑Fi network."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced Wi‑Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi‑Fi frequency band"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specify the frequency range of operation"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"There was a problem while setting the frequency band."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Network prefix length"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Device information"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Remember this connection"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Search for devices"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Forget this group?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable Wi‑Fi hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Portable hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> active"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Portable Wi-Fi hotspot error"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Set up Wi-Fi hotspot"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Portable Wi‑Fi hotspot error"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Set up Wi‑Fi hotspot"</string>
+    <string name="wifi_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="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
@@ -665,14 +687,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
-    <!-- no translation found for notification_sound_title (5137483249425507572) -->
-    <skip />
+    <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Use incoming call volume for notifications"</string>
-    <!-- no translation found for notification_sound_dialog_title (3805140135741385667) -->
-    <skip />
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Default notification sound"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Set volume for music and videos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -792,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signal strength"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC address"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi‑Fi MAC address"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth address"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Unavailable"</string>
@@ -881,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN enabled"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN disabled"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO value"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Delete APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"New APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Save"</string>
@@ -957,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile networks"</string>
     <string name="location_title" msgid="1029961368397484576">"My Location"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi &amp; mobile network location"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"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="7457348712272184793">"Location determined by Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Location determined by Wi‑Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS satellites"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Let apps use GPS on your tablet to pinpoint your location"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Let apps use GPS on your phone to pinpoint your location"</string>
@@ -1084,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Choose filter options"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"All"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disabled"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Downloaded"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Running"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB storage"</string>
@@ -1143,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"If you disable a built-in app, other apps may misbehave. Your data will also be deleted."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Turn off notifications"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"If you turn off notifications for this app, you may miss important alerts and updates."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Running"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Never used)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Storage use"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"View storage used by apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Running services"</string>
@@ -1222,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Word:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Shortcut:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Language:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Type a word"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Optional shortcut"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit word"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Delete"</string>
@@ -1242,7 +1270,7 @@
     <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">"Short cuts"</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="234072873286056438">"Default"</string>
@@ -1262,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Physical keyboard settings"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Developer options"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Developer options are not available for this user"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revoke USB debugging authorisations"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Power menu bug reports"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Include option in power menu for taking a bug report"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Stay awake"</string>
@@ -1272,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"USB debugging is intended for development purposes only. Use it to copy data between your computer and your device, install apps on your device without notification and read log data."</string>
+    <string name="adb_keys_warning_message" msgid="6932230298032192937">"Revoke access to USB debugging from all computers you\'ve previously authorised?"</string>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Allow development settings?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"These settings are intended for development use only. They can cause your device and the applications on it to break or misbehave."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verify apps over USB"</string>
@@ -1316,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Power button ends call"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Speak passwords"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Touch &amp; hold delay"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Enhance web accessibility"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Settings"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"On"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Off"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Allowed"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Not allowed"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Allow"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Don\'t allow"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> can collect all of the text that you type, except passwords. This includes personal data, such as credit card numbers. It can also collect data about your interactions with the tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> can collect all of the text that you type, except passwords. This includes personal data, such as credit card numbers. It can also collect data about your interactions with the phone."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Touching OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observe your actions"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Receive notifications when you\'re interacting with an app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Touching OK will stop <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No services installed"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Need a screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack provides spoken feedback to help blind and low-vision users. Do you want to install it for free from Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Do you want apps to install scripts from Google that make their web content more accessible?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No description provided."</string>
     <string name="settings_button" msgid="3006713718908152930">"Settings"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Battery"</string>
@@ -1346,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Charging"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Screen ON"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS on"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Awake"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobile network signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi-on time"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi-on time"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"History details"</string>
     <string name="details_title" msgid="3792801565213935385">"Use details"</string>
@@ -1361,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Adjust power use"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Included packages"</string>
     <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobile standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
@@ -1371,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Keep awake"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi running"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi running"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Phone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sent"</string>
@@ -1384,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"App info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App settings"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Screen settings"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi settings"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi settings"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth settings"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Battery used by voice calls"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Battery used when tablet is idle"</string>
@@ -1393,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Switch to aeroplane mode to save power in areas with no mobile coverage"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Battery used by the display and backlight"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduce the screen brightness and/or screen timeout"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Battery used by WiFi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Turn off Wi-Fi when not using it or when it isn\'t available"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Battery used by Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Turn off Wi‑Fi when not using it or when it isn\'t available"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Battery used by Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Turn off Bluetooth when you aren\'t using it"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Try connecting to a different Bluetooth device"</string>
@@ -1440,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configure"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Choose another engine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"This speech synthesis engine may be able to collect all the text that will be spoken, including personal data like passwords and credit card numbers. It comes from the <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Enable the use of this speech synthesis engine?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"This language requires a working network connection for text-to-speech output."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Settings"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is enabled"</string>
@@ -1457,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferred engine"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Power control"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Updating WiFi setting"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Updating Wi‑Fi setting"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Updating Bluetooth setting"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"on"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"off"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"turning on"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"turning off"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sync"</string>
@@ -1483,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Storage type"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1504,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Backup &amp; restore"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"personal data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back up my data"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Back up application data, Wi-Fi passwords and other settings to Google servers"</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="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
@@ -1516,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"New password and confirmation don\'t match"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Failure setting backup password"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Stop backing up your Wi-Fi passwords, bookmarks, other settings and app data, plus erase all copies on Google servers?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Stop backing up your Wi‑Fi passwords, bookmarks, other settings and app data, plus erase all copies on Google servers?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Device administration settings"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Device administrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deactivate"</string>
@@ -1532,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifications"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Call ringtone &amp; vibrate"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi setup"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connect to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Connecting to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connected to Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi‑Fi setup"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Connect to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Connecting to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Connected to Wi‑Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Add a network"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Not connected"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Add network"</string>
@@ -1557,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Connecting…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Go to the next step"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP isn\'t supported."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"You can\'t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"You can\'t configure an EAP Wi‑Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Connecting can take a few minutes..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Touch "<b>"Next"</b>" to continue with setup."\n\n"Touch "<b>"Back"</b>" to connect to a different Wi-Fi network."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup."\n\n"Touch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
@@ -1627,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Debugged application waits for debugger to attach before executing"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Drawing"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardware accelerated rendering"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoring"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strict mode enabled"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Flash screen when apps do long operations on main thread"</string>
@@ -1644,22 +1675,17 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"From best to worst: blue, green, light red, red"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Enable tracing"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Select enabled traces"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"No traces currently enabled"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces currently enabled"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"All traces currently enabled"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Enable OpenGL traces"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Show layout bounds"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
     <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
-    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Force use of GPU for 2d drawing"</string>
+    <string name="force_hw_ui_summary" msgid="5535991166074861515">"Force use of GPU for 2D drawing"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Enable 4x MSAA in OpenGL ES 2.0 apps"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Debug non-rectangular clip operations"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profile GPU rendering"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Measure rendering time in adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Window animation scale"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Transition animation scale"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator duration scale"</string>
@@ -1670,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Background process limit"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Show all ANRs"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Show App Not Responding dialogue for background apps"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Use Experimental WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Apps will use the newest (beta) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Data usage"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Data usage cycle"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Data roaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restrict background data"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separate 4G usage"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Show Wi-Fi usage"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Show Wi‑Fi usage"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Show Ethernet usage"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobile hotspots"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Auto-sync data"</string>
@@ -1689,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Set mobile data limit"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Set 4G data limit"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Set 2G-3G data limit"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Set Wi-Fi data limit"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Set Wi‑Fi data limit"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobile"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1721,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your tablet, and your carrier may account for usage differently, consider using a conservative limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Your mobile data connection will be disabled when the specified limit is reached."\n\n"Since data usage is measured by your phone, and your carrier may account for usage differently, consider using a conservative limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restrict background data?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."\n\n"This setting affects all users on this tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network."\n\n"This setting affects all users on this phone."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network."\n\n"This setting affects all users on this tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi‑Fi network."\n\n"This setting affects all users on this phone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"warning"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Removed apps"</string>
@@ -1733,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your tablet. Your carrier\'s data usage accounting may differ."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: about <xliff:g id="TOTAL">%1$s</xliff:g> used, as measured by your phone. Your carrier\'s data usage accounting may differ."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobile hotspots"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Select the WiFi networks which are mobile hotspots. Apps can be restricted from using these networks when in the background. Apps may also warn before using these networks for large downloads."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Select the Wi‑Fi networks which are mobile hotspots. Apps can be restricted from using these networks when in the background. Apps may also warn before using these networks for large downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobile networks"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi networks"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"To select mobile hotspots, turn WiFi on."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi‑Fi networks"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"To select mobile hotspots, turn Wi‑Fi on."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency call"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Return to call"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Name"</string>
@@ -1794,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Users"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"You"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Other users"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Add user"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Active"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Not active"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Users &amp; profiles"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Add user or profile"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Restricted profile"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Set lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Not set up"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Not set up - Restricted profile"</string>
     <string name="user_owner" msgid="3879126011135546571">"Owner"</string>
+    <string name="user_you" msgid="1639158809315025986">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Add"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Users have their own apps and content"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"You can restrict access to apps and content from your account"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Restricted profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Add new user"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust tablet settings like Wi-Fi that affect everyone."\n\n"After you create a new user, that person needs to go through a setup process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"You can share this device with other people by creating additional users. Each user has their own space, which they can customise with their own apps, wallpaper and so on. Users can also adjust tablet settings like Wi‑Fi that affect everyone."\n\n"After you create a new user, that person needs to go through a set-up process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"After you create a new user, that person needs to go through a setup process."\n\n"Any user can accept updated app permissions on behalf of all other users."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Set up user now?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Make sure the person is available to take the tablet and set up their space"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Set up profile now?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Set up now"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Not now"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Only the phone\'s owner can manage users."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Restricted profiles cannot add accounts"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Delete <xliff:g id="USER_NAME">%1$s</xliff:g> from this device"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"New user"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"New profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Delete yourself?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remove user?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Remove profile?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"You will lose your space and data on this tablet. You can\'t undo this action."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"You will lose your space and data on this phone. You can\'t undo this action."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"This user\'s space and data will disappear from this tablet. You can\'t undo this action."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"This user\'s space and data will disappear from this phone. You can\'t undo this action."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"This profile\'s space and data will disappear from this tablet. You can\'t undo this action."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"This profile\'s space and data will disappear from this phone. You can\'t undo this action."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Adding new user…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Delete user"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Delete"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Allow apps and content"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applications with restrictions"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expand settings for application"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"This setting affects all users on this tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"This setting affects all users on this phone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Change language"</string>
@@ -1832,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobile broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Select the types of emergency alerts to display."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Application and content restrictions"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENAME"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Set application limits"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi and Mobile"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Allow modification of Wi‑Fi and Mobile settings"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Allow modification of Bluetooth pairings and settings"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Allow data exchange when the tablet touches another device"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Allow data exchange when the phone touches another device"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Location access"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Let apps use your location information"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Back"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Next"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finish"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Take photo"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Choose photo from Gallery"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 85b471f..ce76840 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lento"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Rápido"</item>
-    <item msgid="2538100882620724753">"Muy rápido"</item>
+    <item msgid="1370673569131070146">"A mayor velocidad"</item>
+    <item msgid="4648206845228970803">"A velocidad muy alta"</item>
+    <item msgid="4977949754169483251">"Rápido"</item>
+    <item msgid="6106302964845503577">"Muy rápido"</item>
+    <item msgid="6800277205640837264">"A velocidad máxima"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muy bajo"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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 +143,7 @@
     <item msgid="8151962652413645395">"2 minutos"</item>
     <item msgid="8675215713017289017">"5 minutos"</item>
     <item msgid="477015974247590543">"1 hora"</item>
-    <item msgid="5198271470953124739">"Sin tiempo de espera"</item>
+    <item msgid="5198271470953124739">"Siempre visible"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Baja calidad"</item>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Ninguno"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ninguno"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Sin especificar"</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">"Dispositivo de almacenamiento interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD desmontable"</item>
     <item msgid="4498124044785815005">"Dejar que el sistema decida"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Ubicación"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Mensajería"</item>
+    <item msgid="8971765125227378270">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ubicación aproximada"</item>
+    <item msgid="5789673140227507995">"ubicación precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrar"</item>
+    <item msgid="3434165993711230924">"leer contactos"</item>
+    <item msgid="616161687718081936">"modificar contactos"</item>
+    <item msgid="7638002295329050091">"leer registro de llamadas"</item>
+    <item msgid="6546959730920410907">"modificar registro de llamadas"</item>
+    <item msgid="446877710771379667">"leer calendario"</item>
+    <item msgid="7674458294386319722">"modificar calendario"</item>
+    <item msgid="8281201165558093009">"búsqueda de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificación"</item>
+    <item msgid="7776439107987345446">"búsqueda de dispositivo"</item>
+    <item msgid="514615766544675057">"llamar a un teléfono"</item>
+    <item msgid="8181415497109310680">"leer SMS"</item>
+    <item msgid="6816551144382117307">"redactar SMS"</item>
+    <item msgid="4600463921908905030">"recibir SMS"</item>
+    <item msgid="5958926493289432745">"recibir SMS de emergencia"</item>
+    <item msgid="4945269495221089540">"recibir MMS"</item>
+    <item msgid="5570472453573929087">"recibir push de WAP"</item>
+    <item msgid="7125408150230860501">"enviar SMS"</item>
+    <item msgid="7080337936612188061">"leer ICC SMS"</item>
+    <item msgid="587124103118495063">"redactar ICC SMS"</item>
+    <item msgid="2320577158869025503">"modificar configuración"</item>
+    <item msgid="1545733463471924009">"dibujar en la parte superior"</item>
+    <item msgid="3609046903962454582">"acceder a las notificaciones"</item>
+    <item msgid="4671646036128214513">"cámara"</item>
+    <item msgid="1097324338692486211">"grabar audio"</item>
+    <item msgid="5031552983987798163">"reproducir audio"</item>
+    <item msgid="8374996688066472414">"leer portapapeles"</item>
+    <item msgid="3045529469061083747">"modificar portapapeles"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ubicación"</item>
+    <item msgid="8677040780775113033">"Ubicación"</item>
+    <item msgid="1660743989948992916">"Ubicación"</item>
+    <item msgid="8791172739860195290">"Vibrar"</item>
+    <item msgid="383413555642128046">"Leer contactos"</item>
+    <item msgid="3654594895269697313">"Modificar contactos"</item>
+    <item msgid="7928393476362362538">"Leer registro de llamadas"</item>
+    <item msgid="6248591205254641116">"Modificar registro de llamadas"</item>
+    <item msgid="6093344633066170692">"Leer calendario"</item>
+    <item msgid="1334886368750347692">"Modificar calendario"</item>
+    <item msgid="1638204101698708656">"Ubicación"</item>
+    <item msgid="2154671955760380322">"Publicar notificación"</item>
+    <item msgid="4282477730595931828">"Ubicación"</item>
+    <item msgid="4891423912898525905">"Llamar a un teléfono"</item>
+    <item msgid="626463821668200388">"Recibir SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Enviar SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Recibir SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Recibir SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Recibir SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Recibir SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Recibir SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Enviar SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modificar configuración"</item>
+    <item msgid="736541391767350377">"Dibujar en la parte superior"</item>
+    <item msgid="5530815681721654194">"Acceder a las notificaciones"</item>
+    <item msgid="781213371706962767">"Cámara"</item>
+    <item msgid="1720492593061838172">"Grabar audio"</item>
+    <item msgid="3493046322001257041">"Reproducir audio"</item>
+    <item msgid="136815868796597058">"Leer portapapeles"</item>
+    <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (gráficos)"</item>
     <item msgid="1340692776955662664">"Pila de llamadas en glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Desactivado"</item>
+    <item msgid="675719912558941285">"Recorte no rectangular en azul"</item>
+    <item msgid="1064373276095698656">"Comandos de dib. probados en verde"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Desactivado"</item>
+    <item msgid="2751513398307949636">"En pantalla como barras"</item>
+    <item msgid="8272260411216018353">"En pantalla como líneas"</item>
+    <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"No hay procesos de fondo."</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 0de5080..2e9af71 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -23,11 +23,11 @@
     <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">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso de ser un programador."</item>
-    <item quantity="other" msgid="6722953419953594148">"Ahora estás a <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos de ser un programador."</item>
+    <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>
-    <string name="show_dev_on" msgid="1110711554982716293">"Ahora eres un programador."</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un programador."</string>
+    <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="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -46,7 +46,7 @@
     <string name="radioInfo_menu_getPDP" msgid="560610293888406317">"Obtener lista PDP"</string>
     <string name="radioInfo_service_in" msgid="1915416319177520020">"En servicio"</string>
     <string name="radioInfo_service_out" msgid="5238736759641916278">"Fuera de servicio"</string>
-    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Sólo llamadas de emergencia"</string>
+    <string name="radioInfo_service_emergency" msgid="2485604591272668370">"Solo llamadas de emergencia"</string>
     <string name="radioInfo_service_off" msgid="1434084741785525415">"Radio apagada"</string>
     <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Roaming"</string>
     <string name="radioInfo_roaming_not" msgid="2851853244069662307">"Sin roaming"</string>
@@ -114,7 +114,7 @@
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Visible para todos los dispositivos Bluetooth cercanos"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"No visible para otros dispositivos Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Solo visible para los dispositivos sincronizados"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Tiempo de visibilidad"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Definir visibilidad"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Bloquear marcación por voz"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Impedir el uso de Bluetooth del dispositivo cuando la pantalla esté bloqueada."</string>
     <string name="bluetooth_devices" msgid="1886018064039454227">"Dispositivos Bluetooth"</string>
@@ -123,7 +123,7 @@
     <string name="bluetooth_profile_details" msgid="6823621790324933337">"Configuración del perfil"</string>
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"No se ha establecido ningún nombre; se utiliza el nombre de cuenta"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Buscar dispositivos"</string>
-    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar el nombre de tableta"</string>
+    <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Cambiar el nombre de tablet"</string>
     <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Cambiar nombre del dispositivo"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Cambiar nombre"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
@@ -149,13 +149,13 @@
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivos 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_discovery" product="tablet" msgid="786921566047356213">"Una aplicación quiere hacer visible tu tableta para otros dispositivos Bluetooth durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</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 tableta para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</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>
     <string name="bluetooth_ask_lasting_discovery" product="default" msgid="6487606808683607975">"Una aplicación quiere hacer visible tu dispositivo para otros dispositivos Bluetooth. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tableta para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="3346529092809011149">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
     <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="4724094889807196118">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos durante <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos."</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tableta para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu dispositivo para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth..."</string>
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"¿Desactivar Bluetooth?"</string>
@@ -184,7 +184,7 @@
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Saltar proxy para"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Restaurar configuraciones predeterminadas"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Finalizado"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Finalizar"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Nombre de host proxy"</string>
     <string name="proxy_hostname_hint" msgid="2076157057003936176">"proxy.example.com"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Atención"</string>
@@ -265,21 +265,21 @@
     <string name="settings_label" msgid="1626402585530130914">"Configuración"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Modo de avión"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Más..."</string>
-    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes inalámbricas y redes"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo de avión, redes, móviles, &amp; VPN"</string>
+    <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectar a servicios de datos en roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Conectar a servicios de datos en roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Has perdido la conectividad de los datos porque has dejado la red doméstica con roaming de datos desactivado."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Enciéndelo"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Al permitir el roaming de datos, puedes incurrir en gastos de roaming importantes."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de esta tableta."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de esta tablet."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Al permitir el roaming de datos, los costos de roaming que deberás asumir pueden ser altos."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="roaming_reenable_title" msgid="6068100976707316772">"¿Deseas permitir el roaming de datos?"</string>
     <string name="networks" msgid="6333316876545927039">"Selección de operador"</string>
-    <string name="sum_carrier_select" msgid="3616956422251879163">"Elige un operador de red"</string>
+    <string name="sum_carrier_select" msgid="3616956422251879163">"Elegir un operador de red"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Fecha y hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Configurar fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Establecer fecha, hora, zona horaria y formatos"</string>
@@ -309,35 +309,37 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ingresa el texto para la pantalla bloqueada."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar datos de usuario en pantalla bloqueada"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Datos de usuario"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar datos del perfil en pantalla bloqueada"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Datos del perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acceso a la ubicación"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <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="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
-    <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tableta"</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>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tableta cada vez que la enciendes"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tablet cada vez que la enciendes"</string>
     <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Se necesita un PIN numérico o contraseña para descifrar tu dispositivo cada vez que lo enciendes"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tableta, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tableta a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tableta conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tablet, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tablet a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tablet conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Luego de encriptar tu dispositivo, tienes que escribir un PIN o contraseña numéricos cada vez que lo enciendes para desencriptarlo. No puedes desencriptar tu dispositivo a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos."\n\n"El proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener el dispositivo conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tableta"</string>
+    <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar dispositivo"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga tu batería e inténtalo nuevamente."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Enchufa tu cargador e inténtalo nuevamente."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Sin contraseña o PIN de pantalla de bloqueo"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Debes configurar una contraseña o PIN de pantalla de bloqueo antes de comenzar con la encriptación."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"¿Deseas encriptar el dispositivo?"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tableta se reiniciará varias veces."</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, la tablet se reiniciará varias veces."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"La encriptación es irreversible y no puede interrumpirse; de lo contrario, perderás información. La encriptación demora al menos una hora. Durante este tiempo, el dispositivo se reiniciará varias veces."</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
-    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta tu tableta. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
+    <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta tu tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se encripta tu dispositivo. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
     <string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe la contraseña"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tableta. "\n\n" Para reanudar el uso de tu tableta, debes restablecer los datos de fábrica. Cuando configures tu tableta luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu tablet. "\n\n" Para reanudar el uso de tu tablet, debes restablecer los datos de fábrica. Cuando configures tu tablet luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"La encriptación se interrumpió y no se puede completar. Por esta razón, ya no es posible acceder a los datos de tu dispositivo. "\n\n"Para reanudar el uso de tu dispositivo, debes restablecer los datos de fábrica. Cuando configures tu dispositivo luego de restablecer los datos de fábrica, tendrás la posibilidad de restaurar los datos de los que tengas una copia de seguridad en tu cuenta de Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Cambiar método de introducción"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elegir bloqueo pant."</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administración del dispositivo"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradores del dispositivo"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar los administradores de dispositivo"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -453,7 +464,7 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desvincular"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconectar y desvincular"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opciones…"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzado"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Config. avanzada"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"Para ver los dispositivos, activa Bluetooth."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Conectar a..."</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recordar la configuración"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Pantalla inalámbrica"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver los dispositivos, activa la pantalla inalámbrica."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Buscar pantallas"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Buscando..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No se encontraron pantallas inalámbricas cercanas."</string>
@@ -514,7 +525,7 @@
     <string name="wifi_display_summary_off" msgid="2445210133184740611">"Desactivada"</string>
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Inhabilitada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tableta entre en contacto con otro dispositivo"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Permitir el intercambio de datos cuando la tablet entre en contacto con otro dispositivo"</string>
     <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Permitir el intercambio de datos cuando el dispositivo toque otro dispositivo"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir el contenido de la aplicación a través de NFC"</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Cuando esta función está activada, puedes transmitir el contenido de las aplicaciones a otro dispositivo con la función NFC al juntar los dispositivos. Por ejemplo, puedes transmitir páginas del navegador, videos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. La aplicación determina el contenido que se transmite."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detección del servicio de red"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir a las aplicaciones de otros dispositivos ver las de este"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Configuración Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Configuración de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Seleccionar Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Activando Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Apagando Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Seleccionar red Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Activando Wi-Fi..."</string>
+    <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 de avión"</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="3038290727701553612">"Notificarme cuando se encuentre disponible una red abierta"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar malas conexiones"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantener Wi-Fi durante la suspensión"</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_scan_always_available" msgid="3470564139944368030">"Búsqueda siempre disponible"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permite al servicio de ubicaciones y a otras aplicaciones de Google buscar redes, incluso con el Wi-Fi apagado"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y para otros fines, Google y otras aplicaciones pueden explorar las redes cercanas, incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Avanzado &gt; Exploración siempre disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas incluso cuando Wi-Fi esté desactivado. Si no quieres que esto ocurra, ve a Config. avanzada &gt; Búsqueda siempre disponible."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mantener Wi-Fi durante suspensión"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Hubo un problema mientras se cambiaba la configuración"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimización de Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar el consumo de la batería con Wi-Fi activado"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimización de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar el consumo de la batería con Wi-Fi activado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Agregar red"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsador WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Más opciones"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ingreso PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ingresar PIN WPS"</string>
+    <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">"Avanzado"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Config. avanzada"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver las redes disponibles, activa Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Buscando redes Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver las redes disponibles, activa Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Buscando redes Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tienes permiso para cambiar la red Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos móviles."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Tu tablet debe tener acceso a Wi-Fi para que puedas completar la configuración. Una vez finalizada, podrás alternar entre la conexión Wi-Fi y la conexión de datos para celulares."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar las opciones avanzadas"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración Wi-Fi protegida"</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="7204827509934892103">"Pulsa el botón Configuración Wi-Fi protegida del router. Es posible que se denomine \"WPS\" o que incluya este símbolo:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introduce el código PIN <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_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_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="5754399645462924103">"Se estableció conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</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>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"No se pudo iniciar la WPS. Vuelve a intentarlo en unos minutos."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite la configuración de la seguridad del enrutador inalámbrico (WEP)."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se produjo un error al realizar la autenticación. Vuelve a intentarlo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se detectó otra sesión WPS. Vuelve a intentarlo en unos minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Red SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Ingresa el SSID."</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potencia de la señal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
@@ -592,7 +611,7 @@
     <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">"Inhabilitadas"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitada"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mala conexión inhabilitada"</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>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denegar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Olvidar"</string>
@@ -610,14 +632,14 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Cancelar"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Omitir de todos modos"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"No omitir"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración de la tableta puede requerir una significativa actividad de la red."</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración de la tablet puede requerir una significativa actividad de la red."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: Es posible que tu proveedor te cobre cargos adicionales por el uso de datos."\n\n"La configuración del dispositivo puede requerir una significativa actividad de la red."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTENCIA: Tu tableta no podrá verificar si el software está actualizado."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTENCIA: Tu dispositivo no podrá verificar si el software está actualizado."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"La tableta no se ha podido conectar a esta red Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El dispositivo no se ha podido conectar a esta red Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avanzada"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTENCIA: Hasta que no te conectes a Internet, la tablet no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTENCIA: Hasta que no te conectes a Internet, el dispositivo no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"La tablet no pudo conectarse a esta red Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El dispositivo no pudo conectarse a esta red Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avanzada de Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda de frecuencia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar el rango de frecuencia de la operación"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problema al configurar la banda de frecuencias."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Acceso"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud de prefijo de red"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Información del dispositivo"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recordar esta conexión"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Buscar dispositivos"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectarte con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Deseas borrar este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar la zona Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">" 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_failed_subtext" msgid="1484941858530919002">"Error en la zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar la zona Wi-Fi"</string>
+    <string name="wifi_tether_configure_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="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -698,7 +720,7 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"El dispositivo no se encuentra en la base"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuración para la base adjunta"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se encontró la base"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Debes acoplar la tableta antes de configurar el audio del conector."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Debes acoplar la tablet antes de configurar el audio del conector."</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Debes acoplar el dispositivo antes de configurar el audio del conector."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar el conector"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido cuando se inserte o elimine el tablet de la base."</string>
@@ -727,7 +749,7 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando esté conectado"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Apagado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar qué sucede cuando el dispositivo está conectado o inactivo, activa el protector de pantalla."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activar el protector de pantalla"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activarlo"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comenzar ahora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Potencia de la señal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Red"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Dirección MAC de Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Dirección MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
@@ -841,8 +863,8 @@
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Poco espacio de almacenamiento"</string>
     <string name="storage_low_summary" msgid="7737465774892563129">"Es posible que algunas funciones del sistema, como la sincronización, no funcionen correctamente. Intenta eliminar o a desactivar elementos para liberar espacio (por ejemplo, aplicaciones o contenido multimedia)."</string>
-    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión de computadora USB"</string>
-    <string name="storage_title_usb" msgid="679612779321689418">"Conexión de computadora USB"</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Conexión con comput. por USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Conexión con comput. por USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectarse como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo multimedia (MTP)"</string>
     <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>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inhabilitado"</string>
     <string name="bearer" msgid="594270280031923558">"Portador"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo de OMV"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de OMV"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nuevo"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
@@ -892,9 +916,9 @@
     <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="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 tableta"</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 tableta, 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="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>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
@@ -904,7 +928,7 @@
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Eliminar la tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tableta"</string>
+    <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Restablecer la tablet"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Restablecer dispositivo"</string>
     <string name="master_clear_final_desc" msgid="7209547812233487345">"¿Deseas eliminar toda tu información personal y aplicaciones descargadas? Esta acción no se puede deshacer."</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Eliminar todo"</string>
@@ -955,17 +979,17 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Ubicación de red Wi-Fi y móvil"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"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="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Ubicación determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que las aplicaciones usen el sistema GPS de tu tableta para determinar tu ubicación"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que las aplicaciones usen el sistema GPS de tu tablet para determinar tu ubicación"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Permitir que las aplicaciones usen el sistema GPS de tu dispositivo para determinar tu ubicación"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir el GPS (anular la selección para reducir el uso de la red)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar el servidor para asistir el GPS (anula la selección para mejorar el rendimiento del GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Búsqueda de Google y ubicación"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"Permitir que Google utilice tu ubicación para aumentar los resultados de búsqueda y otros servicios"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"Permitir que Google utilice tu ubicación para mejorar los resultados de búsqueda y otros servicios"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Acceso a mi ubicación"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Permitir que las aplicaciones que solicitaron permiso usen la información de tu ubicación"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fuentes de ubicación"</string>
@@ -1032,7 +1056,7 @@
     <string name="applications_settings_header" msgid="1014813055054356646">"Configuración de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Fuentes desconocidas"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Permitir la instalación de aplicaciones provenientes de fuentes desconocidas"</string>
-    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tu tableta y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu tableta o pérdida de datos que puedan producirse por el uso de estas aplicaciones."</string>
+    <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Tu tablet y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu tablet o pérdida de datos que puedan producirse por el uso de estas aplicaciones."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Tu dispositivo y datos personales son más vulnerables a los ataques de aplicaciones de fuentes desconocidas. Aceptas que eres el único responsable de cualquier daño a tu dispositivo o pérdida de datos que pueda producirse por el uso de estas aplicaciones."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Verificar aplicaciones"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"No permitir o advertir antes de instalar aplicaciones que puedan ocasionar daños"</string>
@@ -1076,17 +1100,18 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostrar procesos almacenados en la memoria caché"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablec. preferencias?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán las preferencias de:"\n\n" "<li>"aplicaciones desactivadas,"</li>\n" "<li>"notificaciones de aplicaciones desactivadas,"</li>\n" "<li>"aplicaciones predeterminadas para diferentes acciones,"</li>\n" "<li>"restricciones de datos de referencia para las aplicaciones."</li>\n\n" No perderás los datos de ninguna aplicación."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán las preferencias de:"\n\n" "<li>"aplicaciones desactivadas,"</li>\n" "<li>"notificaciones de aplicaciones desactivadas,"</li>\n" "<li>"aplicaciones predeterminadas para diferentes acciones,"</li>\n" "<li>"restricciones de datos en segundo plano para las aplicaciones."</li>\n\n" No perderás los datos de ninguna aplicación."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar el espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Elegir opciones de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Inhabilitadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargado"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"En tarjeta SD"</string>
-    <string name="disabled" msgid="9206776641295849915">"Desactivado"</string>
+    <string name="disabled" msgid="9206776641295849915">"Inhabilitadas"</string>
     <string name="not_installed" msgid="1475144352069281880">"No instalado"</string>
     <string name="no_applications" msgid="7336588977497084921">"No hay aplicaciones."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
@@ -1104,9 +1129,9 @@
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Se desinstalarán todas las actualizaciones de esta aplicación del sistema Android."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Eliminar datos"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"No se pudieron borrar los datos de la aplicación."</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tableta:"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Esta aplicación puede acceder a los siguientes elementos de tu tablet:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Esta aplicación puede acceder a los siguientes elementos del dispositivo:"</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tableta. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Esta aplicación puede acceder a la siguiente información de tu tablet. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Esta aplicación puede acceder a los siguientes elementos de tu dispositivo. Para mejorar el rendimiento y reducir el uso de la memoria, algunos de estos permisos están disponibles en <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> porque se ejecuta en el mismo proceso que <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> y <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> y <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Si desactivas una aplicación integrada, es posible que las otras aplicaciones no funcionen correctamente. También se eliminarán tus datos."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de las aplicaciones"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Sin utilizar)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso del almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver el almacenamiento que usan las aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1176,7 +1204,7 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"El servicio <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"El proveedor <xliff:g id="COMP_NAME">%1$s</xliff:g> está en uso."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Deseas detener el servicio?"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, algunas funciones de la tableta podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, algunas funciones de la tablet podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, algunas funciones del dispositivo podrían dejar de ejecutarse correctamente hasta que lo apagues y enciendas nuevamente."</string>
     <string name="language_settings" msgid="5292716747264442359">"Teclado e idioma"</string>
     <string name="language_keyboard_settings_title" msgid="243220021717425813">"Teclado e idioma"</string>
@@ -1197,7 +1225,7 @@
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Se produjo un error al abrir la configuración de <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>."</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
+    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse y panel táctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de juegos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibración"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palabra:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Acceso directo:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Escribe una palabra."</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Acceso directo opcional"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
@@ -1258,22 +1288,25 @@
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Configuración del teclado en pantalla"</string>
     <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"Teclado físico"</string>
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configuración de teclado físico"</string>
-    <string name="development_settings_title" msgid="215179176067683667">"Opciones del desarrollador"</string>
+    <string name="development_settings_title" msgid="215179176067683667">"Opciones del programador"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Establecer opciones para desarrollar aplicaciones"</string>
-    <string name="enable_adb" msgid="7982306934419797485">"Depuración de USB"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Las opciones de programador no están disponibles para este usuario."</string>
+    <string name="enable_adb" msgid="7982306934419797485">"Depuración por USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración cuando se conecta el USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revocar autorizaciones de depuración por USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Informes de errores en el menú de encendido"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción de realizar un informe de errores en el menú de encendido"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer activo"</string>
-    <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras se realiza la carga"</string>
-    <string name="allow_mock_location" msgid="2787962564578664888">"Permitir ubic. de prueba"</string>
-    <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubic. de prueba"</string>
-    <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración de USB?"</string>
-    <string name="adb_warning_message" msgid="7316799925425402244">"La depuración USB solo está indicada para actividades de desarrollo. Ú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="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras el dispositivo se esté cargando."</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="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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"¿Permitir configuración de desarrollo?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estos parámetros de configuración están destinados únicamente a los programadores. Pueden hacer que el dispositivo o sus aplicaciones no funcionen correctamente."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificar aplicaciones por USB"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprueba que las aplicaciones instaladas mediante ADB/ADT no ocasionen daños."</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprobar que las aplicaciones instaladas mediante ADB/ADT no ocasionen daños"</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger almacenamiento USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Las aplicaciones deben pedir permiso para leer el USB."</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"¿Proteger almacenamiento USB?"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizar automáticamente la ampliación de pantalla"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar la ampliación de pantalla al cambiar de aplicaciones"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"El botón de encendido finaliza la llamada."</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botón de encend. corta la llamada"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Decir contraseñas"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retraso entre tocar y mantener presionado"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Mejorar la accesibilidad web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No se permite"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"No permitir"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"¿Deseas utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> puede recopilar todo el texto que ingresas, a excepción de las contraseñas. Esto incluye datos personales como números de tarjetas de crédito. También puede recopilar datos acerca de tu interacción con la tableta."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> puede recopilar todo el texto que ingresas, a excepción de las contraseñas. Esto incluye datos personales como números de tarjetas de crédito. También puede recopilar datos acerca de tu interacción con el dispositivo."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"¿Deseas detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Si tocas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar tus acciones"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Recibe notificaciones cuando estés interactuando con una aplicación."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"¿Quieres detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Si tocas ACEPTAR, <xliff:g id="SERVICE">%1$s</xliff:g> se detendrá."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se instaló ningún servicio."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack permite que los usuarios con baja visión y no videntes oigan en voz alta las acciones que realizan. ¿Deseas instalarlo gratis desde Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"¿Deseas que las aplicaciones instalen los scripts de Google que mejoran el acceso al contenido web de estas?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se proporcionó ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configuración"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de la red de celulares"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi a tiempo"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi a tiempo"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a tiempo"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a tiempo"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalles del historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Utilizar detalles"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar el uso de energía"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
@@ -1369,8 +1397,8 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantener en funcionamiento"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi en funcionamiento"</string>
-    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tableta"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi en funcionamiento"</string>
+    <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
@@ -1382,17 +1410,17 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Información de la aplicación"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuración de aplicación"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configuraciones de pantalla"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Configuración Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Configuración de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Config. de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"La batería está siendo utilizada por llamadas de voz"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"La batería se utiliza cuando el tablet está inactivo"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"La batería se utiliza cuando el dispositivo está inactivo"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"La batería está siendo utilizada por la radio celular"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Cambiar a modo de avión para ahorrar energía en áreas sin cobertura celular"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Cambiar a modo avión para ahorrar batería en áreas sin cobertura celular"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"La batería está siendo utilizada por la pantalla y la luz de fondo"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reducir el brillo y el tiempo muerto de la pantalla"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"La batería está siendo utilizada por Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Desactiva Wi-Fi cuando no lo uses o cuando no esté disponible."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batería utilizada por Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Desactiva Wi-Fi cuando no lo utilices o cuando no esté disponible."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batería utilizada por Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Desactiva Bluetooth cuando no lo utilices."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Intentar conectarse a un dispositivo Bluetooth diferente"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Elegir otro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz pueda recopilar todo el texto que se hablará, incluidos los datos personales como las contraseñas y los números de tarjetas de crédito. Proviene del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Deseas activar el uso de este motor de síntesis de voz?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma necesita una conexión de red en funcionamiento para la salida de texto a voz."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configuración de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está habilitado."</string>
@@ -1455,17 +1484,17 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualizando configuración de Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
-    <string name="gadget_sync" msgid="858895763714222152">"Sincronización"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Brillo <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamiento"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Copia de seguridad en hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Crea tu patrón de desbloqueo."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes crear tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,19 +1534,19 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Crear copia de seguridad y Restablecer"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Hacer una copia de seguridad de mis datos"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"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_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="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="local_backup_password_title" msgid="3860471654439418822">"Contr. copia segur. escr."</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"En este momento, las copias de seguridad completas de tu escritorio no se encuentran protegidas."</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>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nueva contraseña de copia de seguridad definida"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"La nueva contraseña y la de confirmación no coinciden."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Error al definir contraseña de copia de seguridad"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"¿Deseas dejar de crear copias de seguridad de tus contraseñas Wi-Fi, de tus marcadores, de otros parámetros de configuración y de datos de distintas aplicaciones, y eliminar todas las copias de los servidores de Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"¿Quieres dejar de crear copias de seguridad de tus contraseñas Wi-Fi, de tus marcadores, de otros parámetros de configuración y de datos de distintas aplicaciones, y además eliminar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configuración de la administración del dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador del dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificaciones"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Vibración y tono de llamada"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configurar Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectar a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Conectándose a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a una red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configurar Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Conectar a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Conectándose a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Se estableció la conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Agregar una red"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"No conectado"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Agregar red"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Conectando..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Ir al paso siguiente"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no es compatible."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"No puedes configurar una conexión Wi-Fi con EAP durante la configuración. Luego de esta, puedes hacerlo en Conexiones inalámbricas y redes, en Configuración."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No puedes configurar una conexión Wi-Fi con EAP durante la configuración. Luego, puedes hacerlo en Conexiones inalámbricas y redes, en Configuración."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La conexión puede demorar unos minutos..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tocar "<b>"Siguiente"</b>" para continuar con la instalación."\n\n"Tocar "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con la configuración."\n\n"Toca "<b>"Volver"</b>" para conectarte a otra red Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
@@ -1568,8 +1600,8 @@
     <string name="add_account_label" msgid="7811707265834013767">"Agregar cuenta"</string>
     <string name="background_data" msgid="5779592891375473817">"Datos de fondo"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Las aplicaciones pueden sincronizar, enviar y recibir datos."</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"¿Deseas desactivar los datos de referencia?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Si inhabilitas los datos de referencia, aumenta la duración de la batería y se reduce el uso de datos. Algunas aplicaciones tal vez sigan usando la conexión de datos de referencia."</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"¿Deseas desactivar los datos en segundo plano?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Si inhabilitas los datos en segundo plano, aumenta la duración de la batería y se reduce el uso de datos. Algunas aplicaciones tal vez sigan usando la conexión de datos en segundo plano."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Autosincronizar datos de aplic."</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activada"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sincronización desactivada"</string>
@@ -1583,7 +1615,7 @@
     <string name="sync_one_time_sync" msgid="6766593624598183090">"Tocar para sincronizar ahora<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Calendario"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactos"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Te damos la bienvenida a Google Sync"</font>"  "\n"Con este software de Google, puedes sincronizar tus datos y acceder a tus contactos, citas y más desde cualquier lugar."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Conf. de sincronización de aplicación"</string>
@@ -1594,15 +1626,15 @@
     <string name="header_add_an_account" msgid="756108499532023798">"Agregar una cuenta"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Finalizar"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"¿Deseas eliminar la cuenta?"</string>
-    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos de la tableta."</string>
+    <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos de la tablet."</string>
     <string name="really_remove_account_message" product="default" msgid="3483528757922948356">"Si eliminas esta cuenta, se eliminarán todos sus mensajes, contactos y otros datos del dispositivo."</string>
-    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta cuenta se requiere en algunas aplicaciones. Solo puedes eliminarla si restableces los valores predeterminados de fábrica de la tableta (esta acción borra todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
+    <string name="remove_account_failed" product="tablet" msgid="3086620478225952725">"Esta cuenta se requiere en algunas aplicaciones. Solo puedes eliminarla si restableces los valores predeterminados de fábrica de la tablet (esta acción borra todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
     <string name="remove_account_failed" product="default" msgid="6217238709175617517">"Algunas aplicaciones requieren esta cuenta. Solo puedes eliminarla si restableces el dispositivo a los valores predeterminados de fábrica (esta acción elimina todos tus datos personales). Para ello, accede a Configuración &gt; Hacer copia de seguridad y restablecer."</string>
     <string name="provider_label" msgid="7724593781904508866">"Suscripciones de inserción"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No se puede sincronizar manualmente"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos de referencia y la sincronización automática."</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento actualmente está desactivada. Para cambiar tu configuración, activa momentáneamente los datos en segundo plano y la sincronización automática."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Configuración de 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar &amp; administrar red 4G y módem"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
@@ -1616,64 +1648,62 @@
     <string name="hdcp_checking_title" msgid="8605478913544273282">"Comprobación HDCP"</string>
     <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurar comportamiento de la comprobación HDCP"</string>
     <string name="debug_debugging_category" msgid="6781250159513471316">"Depuración"</string>
-    <string name="debug_app" msgid="8349591734751384446">"Seleccionar la aplicación de depuración"</string>
-    <string name="debug_app_not_set" msgid="718752499586403499">"No se configuró ninguna aplicación de depuración."</string>
-    <string name="debug_app_set" msgid="2063077997870280017">"Aplicación de depuración: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="debug_app" msgid="8349591734751384446">"Seleccionar la aplicación para depurar"</string>
+    <string name="debug_app_not_set" msgid="718752499586403499">"No se especificó ninguna aplicación para depurar."</string>
+    <string name="debug_app_set" msgid="2063077997870280017">"Aplicación para depurar: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="select_application" msgid="5156029161289091703">"Seleccionar la aplicación"</string>
     <string name="no_application" msgid="2813387563129153880">"Ninguna"</string>
-    <string name="wait_for_debugger" msgid="1202370874528893091">"Aguarda a que el depurador se una al proceso."</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"La aplic. aguarda el depurador para ejecutarse."</string>
+    <string name="wait_for_debugger" msgid="1202370874528893091">"Esperar al depurador"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Esperar que se conecte el depurador para iniciar la aplicación"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Dibujo"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Representación acelerada mediante hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoreo"</string>
-    <string name="strict_mode" msgid="1938795874357830695">"El modo estricto está activado"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"Destello de pantalla cuando las aplicaciones realicen operaciones largas en la conversación principal"</string>
+    <string name="strict_mode" msgid="1938795874357830695">"Modo estricto"</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Destellar cuando las aplicaciones realicen operaciones largas en la conversación principal"</string>
     <string name="pointer_location" msgid="6084434787496938001">"Ubicación del puntero"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"Superposición de pantalla que muestra los datos de toque actuales"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Superponer capa en pant. para mostrar puntos tocados"</string>
     <string name="show_touches" msgid="1356420386500834339">"Mostrar toques"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Mostrar información visual para toques"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Ver actualiz. superficie"</string>
-    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Mostrar superficies de vent. cuando se actualizan"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Ver actualiz. de superficie"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Destellar superficie de ventana al actualizarla"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Ver actualiz. vistas GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Mostrar vistas de ventanas procesadas con GPU"</string>
-    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Actualiz. capas hardware"</string>
+    <string name="show_hw_layers_updates" msgid="5645728765605699821">"Ver actualiz. de capas de hardware"</string>
     <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Luz verde en capas de hardware al actualizarse"</string>
     <string name="show_hw_overdraw" msgid="1136884304711318251">"Mostrar superposición GPU"</string>
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De mejor a peor: azul, verde, rojo claro, rojo"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desactivar superpos. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Activar seguimientos"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selec. seguim. activados"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"No se activó ningún seguimiento."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Se activaron <xliff:g id="NUM">%1$d</xliff:g> seguimientos."</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Se activaron todos los seguimientos."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Seguimientos de OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
-    <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar márgenes, límites de clips, etc."</string>
+    <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de recortes, márgenes, etc."</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar el uso de CPU"</string>
-    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposición de pantalla que muestre el uso actual de la CPU"</string>
+    <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mostrar superposición en pantalla con uso actual de la CPU"</string>
     <string name="force_hw_ui" msgid="6426383462520888732">"Forzar representación GPU"</string>
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forzar uso de GPU para dibujar en 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forzar MSAA 4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Activar MSAA 4x en aplicaciones OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Depurar operac. de recorte no rectangulares"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Represent. GPU del perfil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo de repr. en adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ventana de escala de animación"</string>
     <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 duración animador"</string>
-    <string name="overlay_display_devices_title" msgid="5364176287998398539">"Simular pantallas secund."</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="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">"Destruir todas las actividades en cuanto el usuario la abandona"</string>
-    <string name="app_process_limit_title" msgid="4280600650253107163">"Tope de procesos de fondo"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Descartar todas las actividades en cuanto el usuario las abandona"</string>
+    <string name="app_process_limit_title" msgid="4280600650253107163">"Límite de procesos en segundo plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Errores sin respuesta"</string>
-    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar error de que la aplicación no responde para aplicaciones en segundo plano"</string>
+    <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar diálogo cuando las aplic. en 2do plano no responden"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Usar WebView experimental"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Las aplic. usarán última versión (beta) de WebView."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso de datos"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de datos"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir datos de ref."</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restr. datos 2.° plano"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Uso aparte de datos móviles 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar el uso de Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Mostrar el uso de Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostrar uso de Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Zonas Wi-Fi móviles"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizar datos automáticamente"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Establecer límite datos móviles"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Establecer límite de datos en 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Establecer límite de datos 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Establecer límite de datos Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Limitar datos de Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móvil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4 GB"</string>
@@ -1699,14 +1729,14 @@
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Datos de 2 GB - 3 GB"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Datos de 4 GB"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Ver config. de la aplicación"</string>
-    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir los datos de referencia"</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir datos en 2.° plano"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Desactivar datos ref. en redes móviles (usará redes no móviles)"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para limitar datos de ref. de esta aplic., limita datos móviles."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir el uso de datos de referencia?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos de referencia cuando solo estén disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo se pueden restringir los datos de referencia si estableciste un límite de datos móviles."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir datos en 2.° plano aquí, limita datos móviles."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir el uso de datos en segundo plano?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos en segundo plano cuando solo estén disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo se pueden restringir los datos en segundo plano si estableciste un límite de datos móviles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sinc. automática?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tableta."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu tableta. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu tablet."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu tablet. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Cualquier cambio que sufran tus cuentas en la Web se copiará automáticamente en tu dispositivo."\n\n"Algunas cuentas también pueden copiar automáticamente en la Web los cambios que sufre tu dispositivo. Una cuenta de Google funciona de esta manera."\n\n"Para elegir qué tipo de información sincronizar dentro de cada cuenta, ve a Configuración &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sinc. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"Así ahorrarás datos y energía, pero tendrás que sincronizar cada cuenta manualmente para recopilar la información reciente. Por otro lado, no se te notificarán las actualizaciones."</string>
@@ -1716,25 +1746,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Configurar advertencia acerca del uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Establecer el límite de uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar el uso de datos"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu tableta puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu tablet puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos móvil se desactivará cuando se alcance el límite especificado."\n\n"Debido a que el uso de datos medido por tu teléfono puede diferir del cálculo de uso de tu proveedor, considera usar un límite prudente."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos de referencia?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringes los datos para celulares de referencia, algunas aplicaciones y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si restringes los datos móviles de referencia, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de esta tableta."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si restringes los datos móviles de referencia, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos en segundo plano?"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de esta tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes los datos móviles en segundo plano, algunos servicios y aplicaciones no funcionarán a menos que te conectes a una red Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advertencia"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Aplicaciones y usuarios eliminados"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> recibidos, <xliff:g id="SENT">%2$s</xliff:g> enviados"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g>."</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu tableta. La medición de tu proveedor puede diferir."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu tablet. La medición de tu proveedor puede diferir."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: se usaron unos <xliff:g id="TOTAL">%1$s</xliff:g> según tu teléfono. La medición de tu proveedor puede diferir."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Zonas Wi-Fi móviles"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecciona las redes Wi-Fi que sean zonas Wi-Fi móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar un mensaje de advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecciona las redes Wi-Fi que sean zonas móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar una advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para seleccionar zonas Wi-Fi móviles, activa Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Para seleccionar zonas móviles, activa Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regresar a llamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nombre"</string>
@@ -1792,35 +1822,51 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Tú"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Otros usuarios"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Agregar usuario"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Activo"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactivo"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Agregar usuario o perfil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restringido"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restringido, debes configurar un bloqueo de pantalla que proteja tus aplicaciones y datos personales."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Configurar bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"No configurado"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Sin configurar - Perfil restringido"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
+    <string name="user_you" msgid="1639158809315025986">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Seudónimo"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Agregar"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Los usuarios tienen sus propias aplicaciones y contenidos."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Desde tu cuenta, puedes restringir el acceso a las aplicaciones y al contenido."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restringido"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Agregar usuario nuevo"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden ajustar parámetros de configuración de la tableta como la red Wi-Fi."\n\n"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puedes crear usuarios adicionales para compartir este dispositivo con otras personas. Cada usuario cuenta con su propio espacio y puede personalizarlo con sus propios fondos de pantalla, aplicaciones, etc. Los usuarios también pueden cambiar ciertos parámetros de configuración de la tablet como, por ejemplo, la red Wi-Fi, que afectan a todos."\n\n"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Luego de que crees un usuario nuevo, este tiene que pasar por un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar el usuario ahora?"</string>
-    <string name="user_setup_dialog_message" msgid="614037943337008555">"Asegúrate de que la persona esté disponible para aceptar la tableta y configurar su espacio."</string>
+    <string name="user_setup_dialog_message" msgid="614037943337008555">"Asegúrate de que la persona esté disponible para aceptar la tablet y configurar su espacio."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar tu perfil ahora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar ahora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo los propietarios de la tableta pueden administrar los usuarios."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo los propietarios de la tablet pueden administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo los propietarios del dispositivo pueden administrar los usuarios."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden agregar cuentas."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> del disp."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Usuario nuevo"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Deseas eliminarte a ti mismo?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"¿Eliminar usuario?"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en esta tableta. No puedes deshacer esta acción."</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"¿Eliminar perfil?"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en esta tablet. No puedes deshacer esta acción."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderás tu espacio y tus datos en este dispositivo. No puedes deshacer esta acción."</string>
-    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"El espacio y los datos de este usuario desaparecerán de esta tableta. No puedes deshacer esta acción."</string>
+    <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"El espacio y los datos de este usuario desaparecerán de esta tablet. No puedes deshacer esta acción."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"El espacio y los datos de este usuario desaparecerán de este dispositivo. No puedes deshacer esta acción."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"El espacio y los datos de este perfil desaparecerán de esta tablet. No puedes deshacer esta acción."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"El espacio y los datos de este perfil desaparecerán de este teléfono. No puedes deshacer esta acción."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Agregando usuario nuevo..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar usuario"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</string>
-    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tableta."</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>
+    <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de esta tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este dispositivo."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Emisiones móviles"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia para mostrar."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restricción de aplicación/contenido"</string>
+    <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Configurar límites de aplicaciones"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permitir modificar la sincronización y configuración de Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permitir el intercambio de datos cuando la tablet toque otro dispositivo"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Acceso a la ubicación"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permitir que las aplicaciones usen la información de tu ubicación"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Atrás"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Siguiente"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalizar"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Tomar una foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Elegir una foto de la galería"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 564f631..fe1cf2e 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lenta"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="2538100882620724753">"Muy rápida"</item>
+    <item msgid="1370673569131070146">"Más rápida"</item>
+    <item msgid="4648206845228970803">"Muy rápida"</item>
+    <item msgid="4977949754169483251">"Rápida"</item>
+    <item msgid="6106302964845503577">"Muy rápida"</item>
+    <item msgid="6800277205640837264">"La más rápida"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muy bajo"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Ninguno"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ninguno"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Sin especificar"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ninguna"</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">"Almacenamiento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
     <item msgid="4498124044785815005">"Selección del sistema"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Ubicación"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Mensajes"</item>
+    <item msgid="8971765125227378270">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ubicación común"</item>
+    <item msgid="5789673140227507995">"ubicación precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrar"</item>
+    <item msgid="3434165993711230924">"consultar contactos"</item>
+    <item msgid="616161687718081936">"modificar los contactos"</item>
+    <item msgid="7638002295329050091">"leer el registro de llamadas"</item>
+    <item msgid="6546959730920410907">"modificar el registro de llamadas"</item>
+    <item msgid="446877710771379667">"leer calendario"</item>
+    <item msgid="7674458294386319722">"modificar el calendario"</item>
+    <item msgid="8281201165558093009">"búsqueda de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificación"</item>
+    <item msgid="7776439107987345446">"búsqueda de red móvil"</item>
+    <item msgid="514615766544675057">"llamar a un teléfono"</item>
+    <item msgid="8181415497109310680">"leer SMS"</item>
+    <item msgid="6816551144382117307">"escribir SMS"</item>
+    <item msgid="4600463921908905030">"recibir SMS"</item>
+    <item msgid="5958926493289432745">"recibir SMS de emergencia"</item>
+    <item msgid="4945269495221089540">"recibir MMS"</item>
+    <item msgid="5570472453573929087">"recibir WAP Push"</item>
+    <item msgid="7125408150230860501">"enviar SMS"</item>
+    <item msgid="7080337936612188061">"leer SMS ICC"</item>
+    <item msgid="587124103118495063">"escribir SMS ICC"</item>
+    <item msgid="2320577158869025503">"modificar la configuración"</item>
+    <item msgid="1545733463471924009">"dibujar en parte superior"</item>
+    <item msgid="3609046903962454582">"acceder a las notificaciones"</item>
+    <item msgid="4671646036128214513">"cámara"</item>
+    <item msgid="1097324338692486211">"grabar audio"</item>
+    <item msgid="5031552983987798163">"reproducir audio"</item>
+    <item msgid="8374996688066472414">"leer portapapeles"</item>
+    <item msgid="3045529469061083747">"modificar portapapeles"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Ubicación"</item>
+    <item msgid="8677040780775113033">"Ubicación"</item>
+    <item msgid="1660743989948992916">"Ubicación"</item>
+    <item msgid="8791172739860195290">"Vibrar"</item>
+    <item msgid="383413555642128046">"Consultar contactos"</item>
+    <item msgid="3654594895269697313">"Modificar los contactos"</item>
+    <item msgid="7928393476362362538">"Leer el registro de llamadas"</item>
+    <item msgid="6248591205254641116">"Modificar el registro de llamadas"</item>
+    <item msgid="6093344633066170692">"Leer calendario"</item>
+    <item msgid="1334886368750347692">"Modificar el calendario"</item>
+    <item msgid="1638204101698708656">"Ubicación"</item>
+    <item msgid="2154671955760380322">"Publicar notificación"</item>
+    <item msgid="4282477730595931828">"Ubicación"</item>
+    <item msgid="4891423912898525905">"Llamar a un teléfono"</item>
+    <item msgid="626463821668200388">"Recibir SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Enviar SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Recibir SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Recibir SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Recibir SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Recibir SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Recibir SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Enviar SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modificar la configuración"</item>
+    <item msgid="736541391767350377">"Dibujar en parte superior"</item>
+    <item msgid="5530815681721654194">"Acceder a las notificaciones"</item>
+    <item msgid="781213371706962767">"Cámara"</item>
+    <item msgid="1720492593061838172">"Grabar audio"</item>
+    <item msgid="3493046322001257041">"Reproducir audio"</item>
+    <item msgid="136815868796597058">"Leer portapapeles"</item>
+    <item msgid="5238692940326972503">"Modificar portapapeles"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Corto"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (gráficos)"</item>
     <item msgid="1340692776955662664">"Pila de llamadas en glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Desactivado"</item>
+    <item msgid="675719912558941285">"Dibujar región de recorte no rectangular en azul"</item>
+    <item msgid="1064373276095698656">"Resaltar comandos de dibujo probados en verde"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"No"</item>
+    <item msgid="2751513398307949636">"En pantalla como barras"</item>
+    <item msgid="8272260411216018353">"En pantalla como líneas"</item>
+    <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Límite estándar"</item>
     <item msgid="4071574792028999443">"Sin procesos en segundo plano"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d9c5f61..0cbe117 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -23,11 +23,11 @@
     <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">"Solo te queda <xliff:g id="STEP_COUNT">%1$d</xliff:g> paso para ser un desarrollador."</item>
-    <item quantity="other" msgid="6722953419953594148">"Solo te quedan <xliff:g id="STEP_COUNT">%1$d</xliff:g> pasos para ser un desarrollador."</item>
+    <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>
-    <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora eres un desarrollador!"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres un desarrollador."</string>
+    <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="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
@@ -54,7 +54,7 @@
     <string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Sonando"</string>
     <string name="radioInfo_phone_offhook" msgid="4174402846862780998">"Llamada en curso"</string>
     <string name="radioInfo_data_disconnected" msgid="1959735267890719418">"Desconectada"</string>
-    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Estableciendo conexión..."</string>
+    <string name="radioInfo_data_connecting" msgid="8404571440697917823">"Estableciendo conexión"</string>
     <string name="radioInfo_data_connected" msgid="7074301157399238697">"Conectado"</string>
     <string name="radioInfo_data_suspended" msgid="5315325487890334196">"Suspendido"</string>
     <string name="radioInfo_unknown" msgid="737385314432468266">"desconocido"</string>
@@ -89,12 +89,12 @@
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"Tiempo de actividad durante la carga:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"Pantalla de duración de encendido"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconocido"</string>
-    <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando..."</string>
+    <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string>
     <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
     <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
     <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(conexiones inalámbricas)"</string>
-    <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando."</string>
-    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando."</string>
+    <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando"</string>
+    <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
     <string name="battery_info_power_unplugged" msgid="5987246575519551081">"No se está cargando"</string>
     <string name="battery_info_power_ac" msgid="6808516193001604634">"CA"</string>
@@ -135,16 +135,16 @@
     <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</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_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">"Sincronizando..."</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>
-    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de sincronización de Bluetooth"</string>
-    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de sincronización"</string>
-    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca para sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Solicitud de vinculación de Bluetooth"</string>
+    <string name="bluetooth_notif_title" msgid="2485175521845371514">"Solicitud de vinculación"</string>
+    <string name="bluetooth_notif_message" msgid="5300852675110479862">"Toca para vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Mostrar archivos recibidos"</string>
     <string name="device_picker" msgid="8398232791303186677">"Selector de dispositivo Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Solicitud de permiso de Bluetooth"</string>
@@ -158,7 +158,7 @@
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="989613204829097159">"Una aplicación quiere activar el Bluetooth y hacer visible tu tablet para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6671615712909139801">"Una aplicación quiere activar el Bluetooth y hacer visible tu teléfono para otros dispositivos. Puedes cambiar esta configuración más tarde en los ajustes de Bluetooth."</string>
     <string name="bluetooth_turning_on" msgid="4850574877288036646">"Activando Bluetooth…"</string>
-    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth..."</string>
+    <string name="bluetooth_turning_off" msgid="2337747302892025192">"Desactivando Bluetooth…"</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Conexión automática"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Solicitud para establecer conexión de Bluetooth"</string>
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"Toca para conectarte a \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
@@ -228,7 +228,7 @@
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"alternar comprobación de DNS"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"Ajustes/información específica de OEM"</string>
     <string name="band_mode_title" msgid="954174198903776205">"Establecer banda GSM/UMTS"</string>
-    <string name="band_mode_loading" msgid="548764766363847336">"Cargando lista de bandas..."</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"Cargando lista de bandas…"</string>
     <string name="band_mode_set" msgid="5730560180249458484">"Establecer"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Con error"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Correcto"</string>
@@ -246,7 +246,7 @@
     <string name="sdcard_settings_bad_removal_status" product="default" msgid="5145797653495907970">"La tarjeta SD se ha extraído mientras estaba en uso."</string>
     <string name="sdcard_settings_used_bytes_label" msgid="8820289486001170836">"Bytes usados:"</string>
     <string name="sdcard_settings_scanning_status" product="nosdcard" msgid="7503429447676219564">"Buscando archivos almac USB…"</string>
-    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando medios en tarjeta SD..."</string>
+    <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Buscando medios en tarjeta SD…"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Almacenamiento USB activado como solo lectura"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"La tarjeta SD está activada en modo de solo lectura."</string>
     <string name="skip_label" msgid="47510779345218297">"Saltar"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Más…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi‑Fi, Bluetooth, modo avión, redes móviles y redes VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Establecer conexión con servicios de datos en itinerancia"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Establecer conexión con servicios de datos en itinerancia"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduce el texto que se mostrará en la pantalla de bloqueo."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar información de usuario en la pantalla de bloqueo"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Información del usuario"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar información de perfil en pantalla bloqueo"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Información perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acceso a tu ubicación"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <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>
@@ -418,38 +420,47 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administración de dispositivos"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradores de dispositivos"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar administradores de dispositivo"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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 publiquen. Estas notificaciones pueden incluir información personal, como nombres de contactos y texto de mensajes que hayas recibido. También podrá ignorar estas notificaciones o tocar botones de acción de las mismas."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer el nombre del dispositivo y la visibilidad"</string>
-    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de sincronización de Bluetooth"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Para sincronizar con:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe el PIN solicitado por el dispositivo:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Para sincronizar con:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe la clave de acceso solicitada por el dispositivo:"</string>
+    <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Solicitud de vinculación de Bluetooth"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"Para vincular con:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe el PIN solicitado por el dispositivo:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"Para vincular con:<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribe la clave de acceso solicitada por el dispositivo:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN contiene letras o símbolos."</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Normalmente: 0000 o 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Es posible que tengas que introducir este PIN en el otro dispositivo."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Es posible que tengas que introducir la clave de acceso en el otro dispositivo."</string>
-    <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; 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;¿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<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">"Sincronizar"</string>
+    <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_decline" msgid="4185420413578948140">"Cancelar"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
-    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No se ha podido sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se ha podido sincronizar 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_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">"Sincronización rechazada por <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="5957007154213560390">"Buscar dispositivos"</string>
-    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando..."</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Buscando…"</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Ajustes del dispositivo"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Dispositivos sincronizados"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Dispositivos disponibles"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Establecer conexión"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"Desconectar"</string>
-    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Sincronizar y conectar"</string>
+    <string name="bluetooth_device_context_pair_connect" msgid="7611522504813927727">"Vincular y conectar"</string>
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desincronizar"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconectar y desincronizar"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opciones…"</string>
@@ -487,20 +498,20 @@
     <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_dock_settings" msgid="3218335822716052885">"Ajustes del conector"</string>
-    <string name="bluetooth_dock_settings_title" msgid="5543069893044375188">"Uso del conector para audio"</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_display_settings_title" msgid="564299108014609382">"Pantalla inalámbrica"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver los dispositivos, activa la pantalla inalámbrica."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La pantalla inalámbrica está inhabilitada porque la red Wi-Fi está desactivada."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Buscar pantallas"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Buscando…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Sin pantallas inalámbricas cercanas"</string>
+    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No hay pantallas inalámbricas cercanas."</string>
     <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Pantallas sincronizadas"</string>
     <string name="wifi_display_available_devices" msgid="4558314642853513487">"Dispositivos disponibles"</string>
-    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando..."</string>
+    <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
     <string name="wifi_display_status_available" msgid="1924167525172207067">"Disponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Ajustes de pantalla"</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Si la función Android Beam está activada, puedes juntar tu dispositivo con otro compatible con la tecnología NFC para compartir el contenido de las aplicaciones. Por ejemplo, puedes transferir páginas del navegador, vídeos de YouTube, contactos y mucho más."\n\n"Solo tienes que unir los dispositivos (normalmente, por la parte trasera) y, a continuación, tocar la pantalla de tu dispositivo. Las aplicaciones determinan el contenido que puede compartirse."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detección de aplicaciones"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que las aplicaciones de otros dispositivos puedan ver las aplicaciones de este dispositivo"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Ajustes de Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar conexión Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Ajustes de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar y administrar puntos de acceso inalámbricos"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Seleccionar Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Activando Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Desactivando Wi-Fi…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Seleccionar red Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Activando Wi‑Fi…"</string>
+    <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="3038290727701553612">"Notificarme cuando haya una red abierta disponible"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Solo conexiones estables"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Usar Wi-Fi en suspensión"</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_scan_always_available" msgid="3470564139944368030">"Buscar redes siempre"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para mejorar la precisión de la ubicación y otros fines, Google y otras aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Las aplicaciones pueden buscar redes cercanas aunque la conexión Wi-Fi esté desactivada. Si no quieres que esto ocurra, accede a Ajustes avanzados &gt; Buscar redes siempre."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"No volver a mostrar"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Usar Wi-Fi en suspensión"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Error al cambiar la configuración"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimización de Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar el uso de la batería cuando el Wi-Fi esté activado"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimización de Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar uso de batería con Wi-Fi activado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Añadir red"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botón WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Más opciones"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Establecer conexión con red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver redes disponibles, activa la conexión Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Buscando redes Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver redes disponibles, activa el Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Buscando redes Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tienes permiso para cambiar la red Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Otra red…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Más"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuración automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Necesitas conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás alternar entre Wi-Fi y conexión de datos."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Necesitas una conexión Wi-Fi para completar la configuración. Una vez finalizada, podrás cambiar entre la conexión Wi-Fi y de datos."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opciones avanzadas"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración WPS"</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="7204827509934892103">"Pulsa el botón Configuración WPS del router. Es posible que se llame WPS o que incluya este símbolo:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introduce el código PIN <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_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_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="5754399645462924103">"Conexión establecida con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado a la red Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta dos minutos."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Se ha producido un error en la configuración WPS. Inténtalo de nuevo en unos minutos."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite el ajuste de seguridad del router inalámbrico (protocolo WEP)."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Se ha producido un error de autenticación. Inténtalo de nuevo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Se ha detectado otra configuración WPS. Inténtalo de nuevo en unos minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID de red"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduce el SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensidad de la señal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rechazar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Establecer conexión"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Error al conectar a la red"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Borrar"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"No omitir"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVERTENCIA: es posible que se facturen cargos de datos adicionales."\n\n"La configuración del tablet puede requerir una gran cantidad de actividad de red."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVERTENCIA: es posible que se facturen cargos de datos adicionales."\n\n"La configuración del teléfono puede requerir una gran cantidad de actividad de red."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVERTENCIA: el tablet no puede verificar si el software está actualizado."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVERTENCIA: el teléfono no puede verificar si el software está actualizado."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"El tablet no se ha podido conectar a esta red Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"El teléfono no se ha podido conectar a esta red Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Ajustes avanzados de Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frecuencia WiFi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVERTENCIA: hasta que no tengas conexión a Internet, el tablet no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVERTENCIA: hasta que no tengas conexión a Internet, el teléfono no podrá verificar si el software está actualizado."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"El tablet no se ha podido conectar a esta red Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"El teléfono no se ha podido conectar a esta red Wi‑Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ajustes avanzados de Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda de frecuencia Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especificar intervalo frecuencia de funcionamiento"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Error al establecer la banda de frecuencia"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Dirección MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Puerta de enlace"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longitud del prefijo de red"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Información del dispositivo"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Recordar esta conexión"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Buscar dispositivos"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para establecer conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"¿Borrar este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona Wi-Fi…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar zona Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Zona Wi-Fi portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> con seguridad <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Error de zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar zona Wi-Fi"</string>
+    <string name="wifi_tether_configure_subtext" msgid="7957547035983257748">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> de <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
@@ -666,7 +688,7 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Usar LED de notificación"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volumen de llamada entrante para notificaciones"</string>
@@ -674,10 +696,10 @@
     <string name="media_volume_title" msgid="3576565767317118106">"Multimedia"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Establecer volumen para música y vídeos"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarma"</string>
-    <string name="dock_settings_summary" msgid="455802113668982481">"Ajustes de audio del conector adjunto"</string>
+    <string name="dock_settings_summary" msgid="455802113668982481">"Ajustes de audio de la base"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Sonar al marcar número"</string>
-    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sonido al tocar"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sonido de pantalla de bloqueo"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sonar al tocar"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sonido en pantalla de bloqueo"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrar al tocar"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Supresión de ruido"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Música, vídeos, juegos, y otros archivos multimedia"</string>
@@ -689,27 +711,27 @@
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silenciar notificaciones"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silenciar alarmas"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
-    <string name="dock_settings" msgid="1820107306693002541">"Conector"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Ajustes del conector"</string>
+    <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Ajustes de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Ajustes de la base"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Ajustes del conector del coche adjunto"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Ajustes de la base del vehículo"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet no conectado"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Teléfono no conectado"</string>
-    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ajustes del conector adjunto"</string>
-    <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado el conector"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Para configurar el audio del conector, debes insertar el tablet en el conector."</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Para configurar el audio del conector, debes insertar el teléfono en el conector."</string>
+    <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Ajustes de la base"</string>
+    <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado la base"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Para configurar el audio de la base, debes insertar el tablet en la base."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Para configurar el audio de la base, debes insertar el teléfono en la base."</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"Sonido al insertar dispositivo"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido al insertar o extraer el tablet del conector"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono del conector"</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido al insertar o extraer el tablet del conector"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono del conector"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproducir sonido al insertar o extraer el tablet de la base"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido al insertar o extraer el tablet de la base"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono de la base"</string>
     <string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Búsqueda"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
     <string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Pantalla giratoria"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Girar pantalla automáticamente"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Cambiar orientación al girar el tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar orientación al girar el tablet"</string>
@@ -721,10 +743,10 @@
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona una categoría"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Salvapantallas"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando el dispositivo esté en un conector o inactivo y cargando"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Cuando el dispositivo esté en una base o inactivo y cargando"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté en un conector"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Cuando el dispositivo esté conectado a una base"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Para controlar lo que ocurre cuando el teléfono está conectado o inactivo, debes activar el salvapantallas."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Cuándo activarlo"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensidad de la señal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Itinerancia"</string>
     <string name="status_operator" msgid="2274875196954742087">"Red"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Dirección MAC de Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Dirección MAC de Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Dirección de Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"No disponible"</string>
@@ -802,7 +824,7 @@
     <string name="memory_available" msgid="5052397223077021181">"Disponible"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponible (solo lectura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Espacio total"</string>
-    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando..."</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"Calculando…"</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaciones (datos aplicaciones y contenido multimedia)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Multimedia"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descargas"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN habilitado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inhabilitado"</string>
     <string name="bearer" msgid="594270280031923558">"Tipo de conexión"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo de OMV"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de OMV"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuevo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móviles"</string>
     <string name="location_title" msgid="1029961368397484576">"Mi ubicación"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Ubicación por 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="7457348712272184793">"Ubicación determinada por Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Ubicación por 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>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que las aplicaciones usen el GPS del tablet para determinar tu ubicación"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Permitir que las aplicaciones usen el GPS del teléfono para determinar tu ubicación"</string>
@@ -980,11 +1004,11 @@
     <string name="terms_title" msgid="7697580845616764642">"Términos y condiciones"</string>
     <string name="settings_license_activity_title" msgid="7553683406244228650">"Licencias de código abierto"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Se ha producido un problema al intentar cargar las licencias."</string>
-    <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando..."</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"Cargando…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"Información de seguridad"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"No tienes conexión de datos. Para ver esta información, accede a %s desde cualquier ordenador conectado a Internet."</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando..."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Cargando…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Selecciona tu contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Elige un patrón"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Selecciona tu PIN"</string>
@@ -1016,7 +1040,7 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Patrón de desbloqueo"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Patrón obligatorio"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Debes crear un patrón para desbloquear la pantalla."</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Mostrar el patrón"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Mostrar el patrón dibujado"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibrar al tocar"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Bloquear al encender"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Patrón de desbloqueo"</string>
@@ -1076,12 +1100,13 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"¿Restablecer preferencias?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán todas las preferencias de:"\n\n" "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones para acciones predeterminadas"</li>\n" "<li>"Restricciones de datos en segundo plano para aplicaciones"</li>\n\n"No perderás los datos de las aplicaciones."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Se restablecerán todas las preferencias de:"\n\n" "<li>"Aplicaciones inhabilitadas"</li>\n" "<li>"Notificaciones de aplicaciones inhabilitadas"</li>\n" "<li>"Aplicaciones para acciones predeterminadas"</li>\n" "<li>"Restricciones de conexiones automáticas para aplicaciones"</li>\n\n"No perderás los datos de las aplicaciones."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Restablecer aplicaciones"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Administrar espacio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Seleccionar opciones de filtrado"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Inhabilitadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descargadas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En ejecución"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Almacenamiento USB"</string>
@@ -1092,7 +1117,7 @@
     <string name="internal_storage" msgid="1584700623164275282">"Almacenamiento interno"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Almacenamiento USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Tarjeta SD"</string>
-    <string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño..."</string>
+    <string name="recompute_size" msgid="7722567982831691718">"Recalculando tamaño…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"¿Eliminar datos de la aplicación?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Todos los datos de esta aplicación se eliminarán de forma permanente. Esto incluye todos los archivos, configuración, cuentas, bases de datos, etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Aceptar"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Si inhabilitas una aplicación integrada, es posible que otras aplicaciones no funcionen correctamente. Tus datos también se eliminarán."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"¿Desactivar notificaciones?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si desactivas las notificaciones de esta aplicación, es posible que no recibas actualizaciones y alertas importantes."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de la aplicación"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Sin utilizar)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso de almacenamiento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver almacenamiento usado por aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -1178,10 +1206,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"¿Quieres detener el servicio del sistema?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Si detienes este servicio, es posible que algunas funciones del tablet dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si detienes este servicio, es posible que algunas funciones del teléfono dejen de funcionar correctamente hasta que reinicies el dispositivo."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Idioma y entrada de texto"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma y entrada de texto"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Idioma e introducción de texto"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Idioma e introducción de texto"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Ajustes de idioma"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de entrada"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclado y métodos de introducción"</string>
     <string name="phone_language" msgid="8870144109924299673">"Idioma"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Corrección automática"</string>
@@ -1220,12 +1248,14 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palabra:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Texto de sustitución:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Escribe una palabra"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Acceso directo opcional"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"No tienes ninguna palabra en el diccionario del usuario. Toca el botón Añadir (+) para añadir una palabra."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Para todos los idiomas"</string>
-    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Más idiomas..."</string>
+    <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Más idiomas…"</string>
     <string name="testing" msgid="6584352735303604146">"Prueba"</string>
     <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>
@@ -1241,8 +1271,8 @@
     <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">"Entrada de texto"</string>
-    <string name="input_method" msgid="5434026103176856164">"Entrada de texto"</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="234072873286056438">"Predeterminado"</string>
     <string name="input_method_selector" msgid="4311213129681430709">"Selector de método de entrada"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automáticamente"</string>
@@ -1260,9 +1290,11 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ajustes del teclado físico"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opciones de desarrollo"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Establecer opciones de desarrollo de aplicaciones"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Las opciones de desarrollador no están disponibles para este usuario"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuración USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Activar el modo de depuración cuando el dispositivo esté conectado por USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Informe de error en menú"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revocar autorizaciones depur. USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Informe de error menú encendido"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción en el menú de encendido para generar un informe de error"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión si el dispositivo se está cargando"</string>
@@ -1270,10 +1302,11 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"¿Permitir ajustes de desarrollo?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estos ajustes están destinados únicamente a los desarrolladores. Pueden provocar que el dispositivo o las aplicaciones no funcionen correctamente."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificar aplicaciones por USB"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprueba las aplicaciones instaladas mediante ADB/ADT para detectar comportamientos dañinos."</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Comprueba las aplicaciones instaladas mediante ADB/ADT para detectar comportamientos dañinos"</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Proteger almacenamiento USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Las aplicaciones deben solicitar permiso para leer el almacenamiento USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"¿Proteger almacenamiento USB?"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botón encendido cuelga"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Decir contraseñas"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retraso pulsación prolongada"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Mejorar accesibilidad web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ajustes"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivada"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"No permitido"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"No permitir"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"¿Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> puede recopilar todo el texto que escribas (excepto las contraseñas), incluidos datos personales, como números de tarjetas de crédito. También puede recopilar datos sobre la interacción del usuario con el tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> puede recopilar todo el texto que escribes (excepto las contraseñas), incluidos datos personales, como números de tarjetas de crédito. También puede recopilar datos sobre la interacción del usuario con el teléfono."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"¿Detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Si tocas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar tus acciones"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Recibe notificaciones cuando interactúes con una aplicación."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"¿Detener <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Si tocas Aceptar, se detendrá <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"No se ha instalado ningún servicio."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"¿Necesitas un lector de pantalla?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ofrece mensajes de voz para usuarios con discapacidades visuales. ¿Quieres instalarlo de forma gratuita desde Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"¿Quieres que las aplicaciones instalen scripts de Google para mejorar la accesibilidad de su contenido?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"No se ha especificado ninguna descripción."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ajustes"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batería"</string>
@@ -1341,17 +1369,17 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"Uso de la batería desde que se restableció"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de batería"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que se cargó"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando..."</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Cargando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Pantalla encendida"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Activa"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de red móvil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Tiempo de conexión WiFi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tiempo de conexión WiFi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Tiempo de conexión Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Tiempo de conexión Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalles de historial"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalles de uso"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
     <string name="power_screen" msgid="3023346080675904613">"Pantalla"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
@@ -1369,30 +1397,30 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primer plano de la CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Activo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi activado"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Teléfono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Datos enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Datos recibidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Audio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo de activación"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tiempo encendida"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tiempo sin señal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar detención"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Información de la aplicación"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ajustes de aplicación"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ajustes de la pantalla"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Ajustes de Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Ajustes de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ajustes de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batería utilizada por llamadas de voz"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batería utilizada cuando el tablet está inactivo"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Batería utilizada cuando el teléfono está inactivo"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"Batería utilizada por la radio"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Batería utilizada por la señal móvil"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Cambia a modo avión para ahorrar batería en zonas sin cobertura."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batería utilizada por la pantalla y por la retroiluminación"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduce el brillo y el tiempo que permanece encendida la pantalla."</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batería utilizada por la conexión Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Desactiva la conexión Wi-Fi cuando no la estés utilizando o cuando no esté disponible."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batería utilizada por la conexión Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Desactiva la conexión Wi-Fi cuando no la estés usando o cuando no esté disponible."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batería usada por Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Desactiva el Bluetooth cuando no lo estés usando."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Prueba a conectarte a otro dispositivo Bluetooth."</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Seleccionar otro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Es posible que este motor de síntesis de voz recopile todo el texto hablado, incluidos datos personales, como contraseñas y números de tarjeta de crédito. Procede del motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. ¿Quieres habilitar el uso de este motor de síntesis de voz?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requiere una conexión de red activa para la salida de síntesis de voz."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ajustes de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Se ha habilitado <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>."</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"General"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualización de la configuración de la conexión Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de la conexión Wi-Fi..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
-    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando..."</string>
-    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando..."</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
+    <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificados de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamiento"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuja tu patrón de desbloqueo."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Copia de seguridad"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Copiar mis datos"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Hacer copia de seguridad en los servidores de Google de datos de aplicaciones, de contraseñas Wi-Fi y de otros ajustes"</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="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"La nueva contraseña y la de confirmación no coinciden."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Error al establecer contraseña de seguridad"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"¿Quieres dejar de crear copias de seguridad de las contraseñas Wi-Fi, de los marcadores y de otros ajustes y datos de aplicaciones, además de borrar todas las copias de los servidores de Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"¿Quieres dejar de crear copias de seguridad de las contraseñas Wi-Fi, de los marcadores y de otros ajustes y datos de aplicaciones, además de borrar todas las copias de los servidores de Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ajustes de administración de dispositivos"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador de dispositivos"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificaciones"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tono de llamada y vibración"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configuración de Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Establecer conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Estableciendo conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado a la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configuración de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Conectar a la red Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Conectando a la red Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Conectado a la red Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Añadir una red"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Sin conexión"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Añadir red"</string>
@@ -1546,18 +1578,18 @@
     <string name="wifi_setup_forget" msgid="2562847595567347526">"Borrar"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Guardar"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Cancelar"</string>
-    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes..."</string>
+    <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Buscando redes…"</string>
     <string name="wifi_setup_status_select_network" msgid="7519563569903137003">"Toca en una red para conectarte a ella"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Establecer conexión con red existente"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Conectar con red no segura"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Introducir configuración de red"</string>
     <string name="wifi_setup_status_new_network" msgid="7468952850452301083">"Establecer conexión con red nueva"</string>
-    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Conectando..."</string>
+    <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Conectando…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Ir al siguiente paso"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP no compatible"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"No puedes definir una conexión Wi-Fi EAP durante la configuración, pero puedes hacerlo cuando haya finalizado a través de Ajustes &gt; Conexiones inalámbricas y redes."</string>
-    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectando (puede tardar unos minutos)..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toca "<b>"Siguiente"</b>" para continuar con la configuración."\n\n"Toca "<b>"Volver"</b>" para conectarte a otra red Wi-Fi."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"No puedes definir una conexión Wi-Fi EAP durante la configuración, pero puedes hacerlo cuando haya finalizado a través de Ajustes &gt; Conexiones inalámbricas y redes."</string>
+    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectando (puede tardar unos minutos)…"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con el proceso de configuración."\n\n"Toca "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
@@ -1566,10 +1598,10 @@
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Sincronización"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"En este momento hay incidencias con la sincronización. Se restablecerá en breve."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Añadir cuenta"</string>
-    <string name="background_data" msgid="5779592891375473817">"Datos de referencia"</string>
+    <string name="background_data" msgid="5779592891375473817">"Conexiones automáticas"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Las aplicaciones pueden sincronizar datos, enviarlos y recibirlos."</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"¿Inhabilitar datos de referencia?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Si inhabilitas los datos de referencia, aumentarás la duración de la batería y reducirás el uso de datos. Es posible que algunas aplicaciones sigan usando la conexión de datos de referencia."</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"¿Inhabilitar conexiones automáticas?"</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Si inhabilitas las conexiones automáticas, aumentarás la duración de la batería y reducirás el uso de datos. Es posible que algunas aplicaciones sigan usando las conexiones automáticas."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Sincronizar datos aplicaciones autom."</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Sincronización activa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"La sincronización está desactivada"</string>
@@ -1602,7 +1634,7 @@
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
     <string name="cant_sync_dialog_title" msgid="8923508322291625282">"No se puede hacer la sincronización de forma manual."</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente los datos de referencia y la sincronización automática."</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"La sincronización de este elemento no está disponible en este momento. Para modificar tu preferencia, activa temporalmente las conexiones automáticas y la sincronización automática."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Ajustes de 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Configurar y gestionar módem y red 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"La aplicación de depuración espera a que se conecte el depurador para ejecutarse"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Dibujo"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Renderización acelerada por hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Supervisión"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modo estricto"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Destellar si las aplicaciones tardan mucho en el proceso principal"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"De mejor a peor: azul, verde, rojo claro, rojo"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inhabilitar superposiciones HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usar siempre GPU para combinar pantallas"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Habilitar seguimientos"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Elegir seguimientos habilitados"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"No hay seguimientos habilitados en este momento."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> seguimientos habilitados en este momento"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos los seguimientos habilitados"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Habilitar seguimiento OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar límites de diseño"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string>
@@ -1656,11 +1684,11 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forzar uso de GPU para dibujos en 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forzar MSAA 4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Habilitar MSAA 4x en aplicaciones de OpenGL ES 2.0"</string>
-    <string name="track_frame_time" msgid="6146354853663863443">"Representación GPU perfil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tiempo representación en adb shell dumpsys gfxinfo"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Depurar operaciones de recorte no rectangulares"</string>
+    <string name="track_frame_time" msgid="6146354853663863443">"Perfil de renderización de GPU"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de animación ventana"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Escala de transición-animación"</string>
-    <string name="animator_duration_scale_title" msgid="3406722410819934083">"Escala duración animador"</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="debug_applications_category" msgid="4206913653849771549">"Aplicaciones"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"Destruir actividades"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Límitar procesos en 2.º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Errores sin respuesta"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Informar de que una aplicación en segundo plano no responde"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Usar vista web experimental"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Las aplicaciones usarán vista web más reciente (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de datos"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de uso"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Itinerancia de datos"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir datos de referencia"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir conexiones automáticas"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Dividir uso de 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar uso de Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Mostrar uso de Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostrar uso de Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Puntos de acceso móviles"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronización automática"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limitar datos móviles"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Limitar datos 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Limitar datos 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Limitar datos Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Limitar datos Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móviles"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1699,12 +1729,12 @@
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Datos 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Datos 4G"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Ver ajustes de la aplicación"</string>
-    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir datos de referencia"</string>
-    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inhabilitar datos referencia en redes móviles (si es posible, se usarán otras)."</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir los datos de referencia, establece un límite de datos móviles."</string>
-    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir datos de referencia?"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar datos de referencia cuando solo haya disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
-    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo puedes restringir los datos de referencia si estableces un límite de datos móviles."</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Restringir conexiones automáticas"</string>
+    <string name="data_usage_app_restrict_background_summary" msgid="518658001418490405">"Inhabilitar conexiones automáticas en redes móviles (si es posible, se usarán otras)."</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Para restringir las conexiones automáticas, establece un límite de datos móviles."</string>
+    <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"¿Restringir conexiones automáticas?"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Esta función puede hacer que deje de funcionar una aplicación que tenga que utilizar conexiones automáticas cuando solo haya disponibles redes móviles."\n\n"Puedes encontrar controles de uso de datos más adecuados en las opciones de configuración disponibles en la aplicación."</string>
+    <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Solo puedes restringir las conexiones automáticas si estableces un límite de datos móviles."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sincronización automática?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Los cambios que hagas en tus cuentas en la Web se reflejarán automáticamente en el tablet."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el tablet. "\n\n"Para seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Los cambios que hagas en tus cuentas en la Web se reflejarán automáticamente en el teléfono."\n\n"Algunas cuentas como, por ejemplo, las cuentas de Google, también reflejarán en la Web los cambios que hagas en el teléfono. "\n\n"Para seleccionar qué tipo de información se sincronizará con cada cuenta, accede a Ajustes &gt; Cuentas."</string>
@@ -1718,10 +1748,10 @@
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar uso de datos"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el tablet es el que calcula el uso de los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Tu conexión de datos se inhabilitará cuando se alcance el límite especificado."\n\n"Como el teléfono es el que calcula los datos y el cálculo del operador puede ser diferente, te recomendamos que uses un límite moderado."</string>
-    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir datos de referencia?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si restringes los datos móviles de referencia, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si restringes los datos móviles en segundo plano, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios de este teléfono."</string>
+    <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir conexiones automáticas?"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios del tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si restringes las conexiones automáticas, algunas aplicaciones y algunos servicios no funcionarán sin conexión Wi-Fi."\n\n"Esta configuración afecta a todos los usuarios del teléfono."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"límite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaciones eliminadas"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usados (según el cálculo del tablet). El cálculo del uso de datos del operador puede variar."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usados (según el cálculo del teléfono). El cálculo del uso de datos del operador puede variar."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Puntos de acceso móviles"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecciona las redes Wi-Fi que sean puntos de acceso móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar un mensaje de advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecciona las redes Wi-Fi que sean puntos de acceso móviles. Se puede impedir que las aplicaciones usen estas redes cuando se ejecuten en segundo plano. Asimismo, las aplicaciones pueden mostrar un mensaje de advertencia antes de usar estas redes para descargar archivos de gran tamaño."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para seleccionar puntos de acceso móviles, activa el Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Para seleccionar puntos de acceso móviles, activa el Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Llamada de emergencia"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Volver a llamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nombre"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisivo"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatorio"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuarios"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Tú"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Otros usuarios"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Añadir usuario"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Activo"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactivo"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Usuarios y perfiles"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Añadir usuario o perfil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil limitado"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Para poder crear un perfil restringido, debes configurar una pantalla de bloqueo que proteja tus aplicaciones y datos personales."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Establecer bloqueo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Sin configurar"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"No se ha configurado: perfil limitado"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propietario"</string>
+    <string name="user_you" msgid="1639158809315025986">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Apodo"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Añadir"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Los usuarios tienen contenido y aplicaciones propios"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Desde tu cuenta, puedes restringir el acceso a las aplicaciones y al contenido"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuario"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil limitado"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Añadir nuevo usuario"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio y puede personalizarlo con sus propias aplicaciones, fondos de pantalla y muchas otras cosas. Asimismo, los usuarios pueden modificar las opciones de configuración del tablet, como la conexión Wi-Fi, que afectan a todos los usuarios."\n\n"Después de crear un nuevo usuario, este debe completar un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puedes crear más usuarios para compartir este dispositivo con otras personas. Cada usuario tiene su propio espacio y puede personalizarlo con sus propias aplicaciones, fondos de pantalla y muchas otras cosas. Asimismo, los usuarios pueden modificar las opciones de configuración del tablet, como la conexión Wi-Fi, que afectan a todos los usuarios."\n\n"Después de crear un nuevo usuario, este debe completar un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de los usuarios."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Cuendo añadas a un nuevo usuario, deberá completar un proceso de configuración."\n\n"Cualquier usuario puede aceptar permisos de aplicaciones actualizados en nombre del resto de usuarios."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"¿Configurar usuario ahora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Comprueba que el usuario tiene acceso al tablet y puede configurar su espacio."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"¿Quieres configurar un perfil ahora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar ahora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ahora no"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo el propietario del tablet puede administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo el propietario del teléfono puede administrar los usuarios."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden añadir cuentas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> de este dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuevo usuario"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Eliminarte a ti mismo?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"¿Eliminar usuario?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"¿Eliminar el perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderás tu espacio y tus datos en este tablet. Esta acción no se puede deshacer."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderás tu espacio y tus datos en este teléfono. Esta acción no se puede deshacer."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Los datos y el espacio de este usuario se eliminarán de este tablet. Esta acción no se puede deshacer."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Los datos y el espacio de este usuario se eliminarán de este teléfono. Esta acción no se puede deshacer."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Los datos y el espacio de este perfil se eliminarán de este tablet. Esta acción no se puede deshacer."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Los datos y el espacio de este perfil se eliminarán de este teléfono. Esta acción no se puede deshacer."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Añadiendo nuevo usuario…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar usuario"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuración afecta a todos los usuarios de este tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuración afecta a todos los usuarios de este teléfono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambiar idioma"</string>
@@ -1828,6 +1874,27 @@
     <string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Difusiones móviles"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver."</string>
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mensajes de radiodifusión"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restricciones contenido/aplicaciones"</string>
+    <string name="user_rename" msgid="8523499513614655279">"CAMBIAR NOMBRE"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Establecer límites 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permitir modificar los ajustes y las vinculaciones de Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permitir intercambio de datos cuando el tablet toque otro dispositivo"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permitir el intercambio de datos cuando el teléfono toque otro dispositivo"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Acceso a tu ubicación"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permitir a las aplicaciones utilizar tu ubicación"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Volver"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Siguiente"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalizar"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Hacer foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Seleccionar foto de la galería"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 09c8cc5..e72eb1d 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Aeglane"</item>
     <item msgid="1145554631248513562">"Tavaline"</item>
     <item msgid="7553665153391107454">"Kiire"</item>
-    <item msgid="2538100882620724753">"Väga kiire"</item>
+    <item msgid="1370673569131070146">"Kiirem"</item>
+    <item msgid="4648206845228970803">"Väga kiire"</item>
+    <item msgid="4977949754169483251">"Kiire"</item>
+    <item msgid="6106302964845503577">"Väga kiire"</item>
+    <item msgid="6800277205640837264">"Kõige kiirem"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Väga madal"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Puudub"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Puudub"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Määramata"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Puudub"</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">"Seadme sisemine salvestusruum"</item>
     <item msgid="3738430123799803530">"Eemaldatav SD-kaart"</item>
     <item msgid="4498124044785815005">"Lase süsteemil otsustada"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Asukoht"</item>
+    <item msgid="255608127647030286">"Isiklik"</item>
+    <item msgid="4588829735729884491">"Sõnumside"</item>
+    <item msgid="8971765125227378270">"Seade"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"üldine asukoht"</item>
+    <item msgid="5789673140227507995">"täpne asukoht"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibratsioon"</item>
+    <item msgid="3434165993711230924">"kontaktide lugemine"</item>
+    <item msgid="616161687718081936">"kontaktide muutmine"</item>
+    <item msgid="7638002295329050091">"kõnelogi lugemine"</item>
+    <item msgid="6546959730920410907">"kõnelogi muutmine"</item>
+    <item msgid="446877710771379667">"kalendri lugemine"</item>
+    <item msgid="7674458294386319722">"kalendri muutmine"</item>
+    <item msgid="8281201165558093009">"WiFi skannimine"</item>
+    <item msgid="8694611243479480497">"märguanne"</item>
+    <item msgid="7776439107987345446">"mobiili skannimine"</item>
+    <item msgid="514615766544675057">"helistamine telefonile"</item>
+    <item msgid="8181415497109310680">"SMS-i lugemine"</item>
+    <item msgid="6816551144382117307">"SMS-i kirjutamine"</item>
+    <item msgid="4600463921908905030">"SMS-i vastuvõtmine"</item>
+    <item msgid="5958926493289432745">"hädaolukorra SMS-i vastuvõtmine"</item>
+    <item msgid="4945269495221089540">"MMS-i vastuvõtmine"</item>
+    <item msgid="5570472453573929087">"WAP-edastuse vastuvõtmine"</item>
+    <item msgid="7125408150230860501">"SMS-i saatmine"</item>
+    <item msgid="7080337936612188061">"ICC SMS-i lugemine"</item>
+    <item msgid="587124103118495063">"ICC SMS-i kirjutamine"</item>
+    <item msgid="2320577158869025503">"seadete muutmine"</item>
+    <item msgid="1545733463471924009">"peale joonistamine"</item>
+    <item msgid="3609046903962454582">"juurdepääsumärguanded"</item>
+    <item msgid="4671646036128214513">"kaamera"</item>
+    <item msgid="1097324338692486211">"heli salvestamine"</item>
+    <item msgid="5031552983987798163">"heli esitamine"</item>
+    <item msgid="8374996688066472414">"lõikelaua lugemine"</item>
+    <item msgid="3045529469061083747">"lõikelaua muutmine"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Asukoht"</item>
+    <item msgid="8677040780775113033">"Asukoht"</item>
+    <item msgid="1660743989948992916">"Asukoht"</item>
+    <item msgid="8791172739860195290">"Vibratsioon"</item>
+    <item msgid="383413555642128046">"Kontaktide lugemine"</item>
+    <item msgid="3654594895269697313">"Kontaktide muutmine"</item>
+    <item msgid="7928393476362362538">"Kõnelogi lugemine"</item>
+    <item msgid="6248591205254641116">"Kõnelogi muutmine"</item>
+    <item msgid="6093344633066170692">"Kalendri lugemine"</item>
+    <item msgid="1334886368750347692">"Kalendri muutmine"</item>
+    <item msgid="1638204101698708656">"Asukoht"</item>
+    <item msgid="2154671955760380322">"Märguande postitamine"</item>
+    <item msgid="4282477730595931828">"Asukoht"</item>
+    <item msgid="4891423912898525905">"Helistamine telefonile"</item>
+    <item msgid="626463821668200388">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="1237538540368797101">"SMS-i/MMS-i saatmine"</item>
+    <item msgid="3986142739951490025">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="3984213795861739778">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="3656243523752472788">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="8105802370238551510">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="1407766984645388488">"SMS-i/MMS-i saatmine"</item>
+    <item msgid="1530132603376027248">"SMS-i/MMS-i vastuvõtmine"</item>
+    <item msgid="1188256962149204607">"SMS-i/MMS-i saatmine"</item>
+    <item msgid="4218544235221631789">"Seadete muutmine"</item>
+    <item msgid="736541391767350377">"Peale joonistamine"</item>
+    <item msgid="5530815681721654194">"Juurdepääsumärguanded"</item>
+    <item msgid="781213371706962767">"Kaamera"</item>
+    <item msgid="1720492593061838172">"Heli salvestamine"</item>
+    <item msgid="3493046322001257041">"Heli esitamine"</item>
+    <item msgid="136815868796597058">"Lõikelaua lugemine"</item>
+    <item msgid="5238692940326972503">"Lõikelaua muutmine"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lühike"</item>
     <item msgid="2560532955514699713">"Keskmine"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (graafika)"</item>
     <item msgid="1340692776955662664">"Helistamise virn glGetErrori kohta"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Väljas"</item>
+    <item msgid="675719912558941285">"Joonista mittetäisnurkne osa siniselt"</item>
+    <item msgid="1064373276095698656">"Muuda testitud käsud roheliseks"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Väljas"</item>
+    <item msgid="2751513398307949636">"Ekraanil ribadena"</item>
+    <item msgid="8272260411216018353">"Ekraanil joontena"</item>
+    <item msgid="120512413928262547">"Adb-kestas dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardpiir"</item>
     <item msgid="4071574792028999443">"Taustaprotsessideta"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index f54cc42..e40eb5f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Lennurežiim"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Rohkem ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Traadita ühendus ja võrgud"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"WiFi-, Bluetooth-, lennurežiimis ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"WiFi, Bluetoothi, lennukirežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
     <string name="roaming" msgid="3596055926335478572">"Andmerändlus"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Ühenda rändluse ajal andmesideteenustega"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Ühenda rändluse ajal andmesideteenustega"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Sisestage lukustusekraanil kuvatav tekst"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kuva lukustusekraanil teave kasutaja kohta"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Kasutajateave"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kuva lukustusekraanil profiili teave"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiili teave"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Juurdepääs asukohale"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Turvalisus"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Seadme haldamine"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Seadme ülemad"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Seadme ülemate kuvamine või desaktiveerimine"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Lülitage Bluetooth sisse"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Juhtmeta ekraaniühendus"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Seadmete nägemiseks lülitage juhtmeta ekraaniühendus sisse."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Juhtmeta ekraaniühendus on keelatud, sest WiFi-ühendus on välja lülitatud."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Juhtmeta ekraaniühendus on keelatud, sest WiFi on välja lülitatud."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Ekraanide otsimine"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Otsimine …"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Ei leitud WiFi-ekraane."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Kui see funktsioon on sisse lülitatud, saate rakenduse sisu teise NFC-suutlikku seadmesse kiirega saata, hoides seadmeid üksteise lähedal. Nii saate edastada näiteks brauserilehti, YouTube\'i videoid, inimeste kontakte ja muud."\n\n"Lihtsalt hoidke seadmeid lähestikku (tavaliselt tagused koos) ja siis puudutage seadme ekraani. Rakendus otsustab, mida kiirega edastatakse."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Võrguteenuse avastus"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Luba muudes seadmetes olevatel rakendustel selle seadme rakendusi leida"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WiFi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Lülitage WiFi sisse"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"WiFi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"WiFi-seaded"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"WiFi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Lülita WiFi sisse"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"WiFi-seaded"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Määra ja halda traadita pääsupunkte"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"WiFi valimine"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"WiFi sisselülitamine ..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"WiFi väljalülitamine ..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"WiFi valimine"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"WiFi sisselülitamine ..."</string>
+    <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="3038290727701553612">"Teata mulle, kui avatud 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="2466956369738047669">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Sisselülitatud WiFi unerežiimis"</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_scan_always_available" msgid="3470564139944368030">"Skannimine on alati saadaval"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Luba Google\'i asukohateenusel ja muudel rakendustel võrke skannida ka juhul, kui WiFi on välja lülitatud"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifikaatide installimine"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Asukoha täpsuse parandamiseks ning muudel eesmärkidel võivad Google ja teised rakendused otsida läheduses olevaid võrke ka siis, kui WiFi on väljas. Kui te seda ei soovi, tehke valikud Täpsem &gt; Otsimine alati saadaval."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Rakendused võivad otsida läheduses olevaid võrke ka siis, kui WiFi on väljas. Kui te seda ei soovi, tehke valikud Täpsem &gt; Otsimine alati saadaval."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ära kuva uuesti"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hoia WiFi unerežiimis sees"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Seade muutmisel tekkis probleem"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"WiFi optimeerimine"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimeeri aku kasutamine, kui WiFi on sees"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WiFi optimeerimine"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimeeri aku kasutamine, kui WiFi on sees"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Võrgu lisamine"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"WiFi-võrgud"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"WiFi-võrgud"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-nupp"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Rohkem valikuid"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-i PIN-koodi kirje"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Otsene WiFi"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WiFi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Skannimine"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Täpsemalt"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Loo võrguühendus"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unusta võrk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"WiFi-võrkude otsimine ..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"WiFi-võrkude otsimine ..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Teil pole WiFi-võrgu muutmiseks luba."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu võrk ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Rohkem"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaatseadistus (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Seadistuse lõpule viimiseks vajab teie tahvelarvuti WiFi-ühendust. Pärast seadistust saate vahetada mobiilse andmeside ja WiFi vahel."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Seadistuse lõpuleviimiseks vajab teie tahvelarvuti WiFi-ühendust. Pärast seadistust saate vahetada mobiilse andmeside ja WiFi vahel."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Kuva täpsemad valikud"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kaitstud WiFi seadistamine"</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="7204827509934892103">"Vajutage marsruuteril nuppu Kaitstud Wi-Fi seadistamine. Selle nimi võib olla ka „WPS” või see võib sisaldada sellist sümbolit:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Ühendatud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Ühendus on loodud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS on juba käimas ja selle lõpuleviimiseks võib kuluda kuni kaks minutit"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ebaõnnestus. Proovige mõne minuti pärast uuesti."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ruuteri turvaseadet (WEP) ei toetata"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentimine ebaõnnestus. Proovige uuesti."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tuvastati teine WPS-i seanss. Proovige mõne minuti pärast uuesti."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Võrgu SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Sisestage SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Turvalisus"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaali tugevus"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Olek"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Kas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Keela"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ühenda"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unusta"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Ära jäta vahele"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"HOIATUS: operaatoril võib andmeedastusele kehtida lisahind."\n\n"Tahvelarvuti seadistamiseks võib olla vajalik suur võrguaktiivsus."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"HOIATUS: operaatoril võib andmeedastusele kehtida lisahind."\n\n"Telefoni seadistamiseks võib olla vajalik suur võrguaktiivsus."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"HOIATUS: tahvelarvuti ei saa kontrollida, kas teie tarkvara on ajakohane."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"HOIATUS: telefon ei saa kontrollida, kas teie tarkvara on ajakohane."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tahvelarvutil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Täpsemad WiFi-seaded"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"WiFi sagedusriba"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"HOIATUS. Kuni teil puudub Interneti-ühendus, ei saa tahvelarvuti teie tarkvara ajakohasust kontrollida."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"HOIATUS. Kuni teil puudub Interneti-ühendus, ei saa te tarkvara ajakohasust kontrollida."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tahvelarvutil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonil ei õnnestunud luua ühendust selle WiFi-võrguga."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Täpsemad WiFi-seaded"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"WiFi sagedusriba"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tegevuse sagedusvahemiku määramine"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Sagedusriba määramisel tekkis probleem."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-aadress"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Lüüs"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Võrgu prefiksi pikkus"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"WiFi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WiFi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Seadme teave"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Pea see ühendus meeles"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Otsi seadmeid"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kas tühistada kutse?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Kas soovite tühistada kutse kasutajaga <xliff:g id="PEER_NAME">%1$s</xliff:g> ühenduse loomiseks?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kas unustada see rühm?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kantav WiFi-tööpunkt"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kaasaskantav WiFi-tugijaam"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kantav tööpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kantava WiFi-tööpunkti viga"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"WiFi leviala seadistamine"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kantav WiFi-tööpunkt"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kaasaskantava WiFi-tugijaama viga"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WiFi-tugijaama seadistamine"</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="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signaali tugevus"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Rändlus"</string>
     <string name="status_operator" msgid="2274875196954742087">"Võrk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"WiFi MAC-aadress"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WiFi MAC-aadress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothi aadress"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seerianumber"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Pole saadaval"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN on lubatud"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN on keelatud"</string>
     <string name="bearer" msgid="594270280031923558">"Kandja"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO tüüp"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO väärtus"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Kustuta pääsupunktinimi"</string>
     <string name="menu_new" msgid="3014205883303921729">"Uus pääsupunktinimi"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvesta"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiilsidevõrgud"</string>
     <string name="location_title" msgid="1029961368397484576">"Minu asukoht"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"WiFi ja mobiilsidevõrgu asukoht"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"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="7457348712272184793">"WiFi määratud asukoht"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"WiFi järgi määratud asukoht"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-i satelliidid"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Lubage rakendustel tahvelarvuti GPS-i abil teie asukohta määrata"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Lubage rakendustel telefoni GPS-i abil teie asukohta määrata"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtrivalikute valimine"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Kõik"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Keelatud"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Allalaaditud"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Töös"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-mäluseade"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Kui keelate sisseehitatud rakenduse, võib teiste rakenduste toimivus muutuda ebastabiilseks. Samuti kustutatakse teie andmed."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Kas lülitada teatised välja?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Kui lülitate selle rakenduse teatised välja, võivad olulised märguanded ja värskendused märkamata jääda."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Rakenduse tööd"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Töötab"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Pole kasutatud)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Kasutatud mälu"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vaadake rakenduste kasutatavat mälu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käitatud teenused"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Sõna:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Otsetee:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Keel:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Sisestage sõna"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Valikuline otsetee"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Muuda sõna"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Muuda"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Kustuta"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Füüsilise klaviatuuri seaded"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Arendaja valikud"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Rakenduse arenduse valikute määramine"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Arendaja valikud pole selle kasutaja jaoks saadaval"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB silumine"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Silumisrežiim, kui USB on ühendatud"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Tühista USB silumisvolitused"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Toitemenüü veaaruanded"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Kaasa toitemenüüs veaaruande tegemise valik"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Jää sisselülitatuks"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Kas lubada arendajaseaded?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Need seaded on mõeldud ainult arendajatele. Need võivad põhjustada seadme ja seadmes olevate rakenduste rikkeid või valesti toimimist."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Kinnita rakendus USB kaudu"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Toitenupp lõpetab kõne"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Paroolide ettelugemine"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Puudutage ja hoidke viivitust"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Veebijuurdepääsu täiustamine"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Seaded"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Sees"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Väljas"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Lubatud"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ei ole lubatud"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Luba"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Ära luba"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> võib koguda kogu teie sisestatud teksti, v.a paroolid. Siia kuuluvad ka isiklikud andmed, näiteks krediitkaardinumbrid. Teenus võib koguda andmeid ka tahvelarvuti kasutamise kohta."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> võib koguda kogu teie sisestatud teksti, v.a paroolid. Siia kuuluvad ka isiklikud andmed, näiteks krediitkaardinumbrid. Teenus võib koguda andmeid ka telefoni kasutamise kohta."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Kas soovite teenuse <xliff:g id="SERVICE">%1$s</xliff:g> peatada?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Kui puudutate OK, siis teenus <xliff:g id="SERVICE">%1$s</xliff:g> peatub."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Toimingute jälgimine"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Saama märguandeid, kui te kasutate rakendust."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Kas peatan teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Kui puudutate OK, siis teenus <xliff:g id="SERVICE">%1$s</xliff:g> peatub."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ühtki teenust pole installitud"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kas vajate ekraanilugejat?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack esitab tagasiside suulise kõnena, mis aitab pimedaid ja vaegnägijaid. Kas soovite selle Android Marketist tasuta installida?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Kas lubate rakendustel installida Google\'ist pärinevaid skripte, mis muudavad veebisisu kättesaadavamaks?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Kirjeldust ei ole sisestatud."</string>
     <string name="settings_button" msgid="3006713718908152930">"Seaded"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Aku"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Laadimine"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekraan sees"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS on sisse lülitatud"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WiFi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"WiFi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Sisse lülitatud"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobiilsidevõrgu signaal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Seadme ärkveloleku aeg"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"WiFi õigel ajal"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi õigel ajal"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"WiFi õigel ajal"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"WiFi õigel ajal"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Ajaloo üksikasjad"</string>
     <string name="details_title" msgid="3792801565213935385">"Üksikasjade kasutamine"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Reguleerige energiakasutust"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Kaasnevad paketid"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekraan"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"WiFi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobiiltelefon ooterežiimil"</string>
     <string name="power_phone" msgid="5392641106474567277">"Tavakõned"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU esiplaanil"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Hoia ärkvel"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi töötab"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"WiFi töötab"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tahvelarvuti"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Saadetud andmed"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Rakenduse teave"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Rakenduse seaded"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ekraani seaded"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-seaded"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"WiFi-seaded"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetoothi ​​seaded"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Tavakõnede akukasutus"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Akukasutus tahvelarvuti ooterežiimis"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Aku säästmiseks lülitu mobiililevita kohtades lennurežiimile"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Ekraani ja taustvalguse akukasutus"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Vähenda ekraani heledust ja/või ekraani ajalõppu"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"WiFi kasutatav aku"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Lülitage WiFi välja, kui te seda ei kasuta või kui see pole saadaval"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"WiFi kasutatav aku"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Lülitage WiFi välja, kui te seda ei kasuta või see pole saadaval"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetoothi akukasutus"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Kui te Bluetoothi ei kasuta, lülitage see välja"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Proovige ühendus luua teise Bluetoothi seadmega"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Seadista"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Vali teine ​​mootor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"See kõnesünteesimootor võib koguda kogu kõneldud teksti, sh isiklikke andmeid, nagu paroolid ja krediitkaardinumbrid. Selle aluseks on mootor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Kas lubada kõnesünteesimootori kasutamine?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Selle keele puhul on kõnesünteesi väljundi jaoks vaja toimivat võrguühendust."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mootorid"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Mootori <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> seaded"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on lubatud"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Eelistatud mootor"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Üldine"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Toite juhtimine"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"WiFi-seade värskendamine"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"WiFi-seade värskendamine"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetoothi seade värskendamine"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"sees"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"väljas"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"sisselülitamine"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"väljalülitamine"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sünkroonimine"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Kõikide sertifikaatide eemaldamine"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Usaldusväärsed mandaadid"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Usaldusväärsete CA-sertifikaatide kuvamine"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Salvestusruumi tüüp"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Riistvaratoega"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Ainult tarkvara"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Joonistage oma luku avamise muster"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Varundamine ja taastamine"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Isikuandmed"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Minu andmete varundamine"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Varundage rakenduste andmed, WiFi paroolid ja muud seaded Google\'i serverites"</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="auto_restore_title" msgid="5397528966329126506">"Automaatne taastamine"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Uus parool ja kinnitus ei ühti"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Varuparooli määramine ebaõnnestus"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Kas soovite WiFi paroolide, järjehoidjate, muude seadete ja rakenduste andmete varundamise lõpetada ja kõik Google\'i serverites olevad koopiad kustutada?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Kas soovite WiFi-paroolide, järjehoidjate, muude seadete ja rakenduse andmete varundamise lõpetada ja kõik Google\'i serverites olevad koopiad kustutada?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Seadme haldusseaded"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Seadme ülem"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Inaktiveeri"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Teatised"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Kõne helin ja vibratsioon"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Süsteem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"WiFi seadistamine"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> on ühendus loodud"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"WiFi seadistamine"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g> ühenduse loomine ..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Ühendus on loodud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Võrgu lisamine"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ühendus puudub"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Lisa võrk"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Ühendamine ..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Minge järgmise sammu juurde"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP-d ei toetata."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Seadistamise ajal ei saa häälestada EAP WiFi-ühendust. Saate seda teha pärast seadistamise lõppu. Selleks tehke valikud Seaded &gt; Traadita võrgud."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Seadistamise ajal ei saa seadistada EAP WiFi-ühendust. Saate seda teha pärast seadistamise lõppu. Selleks tehke valikud Seaded &gt; Traadita ühendus ja võrgud."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Ühendamiseks võib kuluda mõni minut ..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Seadistamise jätkamiseks puudutage nuppu "<b>"Järgmine"</b>"."\n\n"Kui tahate teise Wifi-võrguga ühendust luua, vajutage nuppu "<b>"Tagasi"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Seadistamise jätkamiseks puudutage nuppu "<b>"Edasi"</b>"."\n\n"Teise WiFi-võrguga ühenduse loomiseks puudutage valikut "<b>"Tagasi"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sünkroonimine lubatud"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sünkroonimine keelatud"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sünkroonimise viga"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Silutud rakendus ootab toimimiseks siluri lisamist"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Sisend"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Joonis"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Tarkvarakiirendusega renderdamine"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Jälgimine"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Range režiim on lubatud"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Ekr. vilgub, kui rakend. teevad peateemal toiming."</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Parimast halvimani: sin., roh., helepunane, punane"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Keela HW ülekatted"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Luba jälgimine"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vali lubatud jälgimised"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Praegu pole lubatud ükski jälgimine"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jälgimist on praegu lubatud"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kõik jälgimised on praegu lubatud"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Luba OpenGL-i jälgimine"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näita paigutuse piire"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kuva klipi piirid, veerised jms"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Jõusta GPU kasutam. kahemõõtmeliste jooniste puhul"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Jõusta 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Luba 4x MSAA OpenGL ES 2.0 rakendustes"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Silu klipi mittetäisnurksed toimingud"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profiili GPU renderdamine"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mõõda renderdusaega adb-kestas: dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Akna animatsiooni skaala"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ülemineku animats. skaala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animaatori kestuse skaala"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Taustaprotsesside piir"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Näita kõiki ANR-e"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Kuva taustarakendustele dial. Rakendus ei reageeri"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Kasuta katselist WebView\'d"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Rakendused kasutavad uusimat (beetaversioonis) WebView\'d"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Andmekasutus"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Andmete kasutamistsükkel"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Andmerändlus"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Piira taustaandmeid"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Eraldi 4G kasutamine"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"WiFi kasutamise kuvamine"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Kuva WiFi kasutust"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Kuva Etherneti-kasutus"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobiilside leviala"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Andmete automaatne sünkroonimine"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Seadke mobiilandmeside piirang"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Määrake 4G andmemahupiirang"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Määrake 2G-3G andmemahupiirang"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Määrake WiFi andmepiirang"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"WiFi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Määra WiFi andmepiirang"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"WiFi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Määratud limiidi saavutamisel keelatakse mobiilne andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie tahvelarvuti ja teenusepakkuja võib arvestada kasutust teisiti."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Määratud limiidi saavutamisel keelatakse mobiilne  andmesideühendus."\n\n"Kaaluge konservatiivse limiidi kasutamist, kuna andmekasutust mõõdab teie telefon ja teenusepakkuja võib arvestada kasutust teisiti."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Kas soovite taustandmeid piirata?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Kui piirate mobiilside taustandmed, siis WiFi-võrgu puudumisel mõned rakendused ja teenused ei tööta."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Kui piirate mobiilset taustandmevahetust, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Kui piirate mobiilset taustandmevahetust, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki telefoni kasutajaid."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Kui piirate mobiilside taustandmeid, siis WiFi-võrgu puudumisel mõned rakendused ja teenused ei tööta."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Kui piirate mobiilside taustandmeid, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Kui piirate mobiilside taustandmeid, siis teatud rakendused ja teenused ei tööta, välja arvatud juhul, kui olete ühenduses WiFi-võrguga."\n\n"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"hoiatus"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"piir"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eemaldatud rakendused"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: tahvelarvuti mõõdetud kasutus u <xliff:g id="TOTAL">%1$s</xliff:g>. Oper. andmekasutuse arvestus võib erineda."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: telef. mõõdetud kasutus on u <xliff:g id="TOTAL">%1$s</xliff:g>. Operaatori andmekasutuse arvestus võib erineda."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiilside leviala"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Valige WiFi-võrgud, mis töötavad mobiilside levialadena. Taustarakendusi on võimalik takistada neid võrke kasutamast. Teid võidakse enne hoiatada, kui rakendused laadivad võrkude kaudu alla mahukaid üksusi."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Valige WiFi-võrgud, mis on tekitatud nutitelefonide abil. Taustarakendusi on võimalik takistada neid võrke kasutamast. Teid võidakse enne hoiatada, kui rakendused laadivad võrkude kaudu alla mahukaid üksusi."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiilsidevõrgud"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi-võrgud"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Mobiilside levialade valimiseks lülitage WiFi sisse."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"WiFi-võrgud"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Nutitelefonide võrkude valimiseks lülitage WiFi sisse."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hädaabikõne"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tagasi kõne juurde"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nimi"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Lubav"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Jõustumisel"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kasutajad"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Teie"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Teised kasutajad"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Kasutaja lisamine"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiivne"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Pole aktiivne"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Kasutajad ja profiilid"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Lisa kasutaja või profiil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Piiratud profiil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Enne piiratud profiili loomist peate seadistama lukustusekraani, et oma rakendusi ja isiklikke andmeid kaitsta."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Määra lukk"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Pole seadistatud"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Pole seadistatud – piiratud profiil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Omanik"</string>
+    <string name="user_you" msgid="1639158809315025986">"Teie (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Hüüdnimi"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Lisamine"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Kasutajatel on oma rakendused ja sisu"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Oma kontol saate piirata juurdepääsu rakendustele ja sisule"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Kasutaja"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Piiratud profiil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Uue kasutaja lisamine"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Võite jagada seadet teiste kasutajatega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka tahvelarvuti seadeid, näiteks WiFi valikuid, mis mõjutavad kõiki kasutajaid."\n\n"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduste lubasid."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Võite jagada seadet teiste kasutajatega, luues uusi kasutajaid. Igal kasutajal on oma ruum, mida saab kohandada rakenduste, taustapildi ja muuga. Kasutajad saavad kohandada ka tahvelarvuti seadeid, näiteks WiFi-valikuid, mis mõjutavad kõiki kasutajaid."\n\n"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduse lubasid."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Pärast uue kasutaja loomist peab kasutaja läbima seadistusprotsessi."\n\n"Iga kasutaja saab teiste kasutajate nimel võtta vastu värskendatud rakenduste lubasid."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kas seadistada nüüd kasutaja?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Veenduge, et isik saab tahvelarvutit kasutada ja oma ruumi seadistada"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Kas soovite kohe profiili seadistada?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Seadista nüüd"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Mitte praegu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Ainult tahvelarvuti omanik saab hallata kasutajaid."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Ainult telefoni omanik saab hallata kasutajaid."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Piiratud profiilid ei saa kontosid lisada"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Kustuta seadmest <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Uus kasutaja"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Uus profiil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kas soovite kustutada iseenda?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Kas eemaldada kasutaja?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Kas eemaldada profiil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Kaotate selles tahvelarvutis olevad ruumi ja andmed. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Kaotate selles telefonis olevad ruumi ja andmed. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Kasutaja ruum ja andmed kaovad tahvelarvutist. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Kasutaja ruum ja andmed kaovad telefonist. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Selle profiili ruum ja andmed kaovad tahvelarvutist. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Selle profiili ruum ja andmed kaovad telefonist. Seda toimingut ei saa tagasi võtta."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Uue kasutaja lisamine ..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Kasutaja kustutamine"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Kustuta"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Seade mõjutab kõiki tahvelarvuti kasutajaid."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Seade mõjutab kõiki telefoni kasutajaid."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Muuda keelt"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kärjeteated"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valige kuvamiseks hädaolukorra märguannete tüübid."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Rakenduste ja sisu piirangud"</string>
+    <string name="user_rename" msgid="8523499513614655279">"NIMETA ÜMBER"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Määra rakenduse piirangud"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetoothi sidumiste ja seadete muutmise lubamine"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Andmete vahetuse lubamine, kui tahvelarvuti puudutab teist seadet"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Andmete vahetuse lubamine, kui telefon puudutab teist seadet"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Juurdepääs asukohale"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Rakendustel asukohateabe kasutamise lubamine"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Tagasi"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Järgmine"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Lõpeta"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Jäädvusta foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Vali foto galeriist"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 0e1c59e..76de88b 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"آهسته"</item>
     <item msgid="1145554631248513562">"معمولی"</item>
     <item msgid="7553665153391107454">"سریع"</item>
-    <item msgid="2538100882620724753">"بسیار سریع"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"هیچکدام"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"هیچکدام"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"مشخص نشده"</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">"دستگاه ذخیره‌سازی داخلی"</item>
     <item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
     <item msgid="4498124044785815005">"سیستم تصمیم بگیرد"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"مکان"</item>
+    <item msgid="255608127647030286">"شخصی"</item>
+    <item msgid="4588829735729884491">"پیام‌رسانی"</item>
+    <item msgid="8971765125227378270">"دستگاه"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"موقعیت مکانی غیردقیق"</item>
+    <item msgid="5789673140227507995">"موقعیت مکانی دقیق"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"لرزش"</item>
+    <item msgid="3434165993711230924">"خواندن مخاطبین"</item>
+    <item msgid="616161687718081936">"اصلاح مخاطبین"</item>
+    <item msgid="7638002295329050091">"خواندن گزارش تماس"</item>
+    <item msgid="6546959730920410907">"اصلاح گزارش تماس"</item>
+    <item msgid="446877710771379667">"خواندن تقویم"</item>
+    <item msgid="7674458294386319722">"اصلاح تقویم"</item>
+    <item msgid="8281201165558093009">"جستجوی شبکه wi-fi"</item>
+    <item msgid="8694611243479480497">"اعلان"</item>
+    <item msgid="7776439107987345446">"جستجوی شبکه سلولی"</item>
+    <item msgid="514615766544675057">"تماس تلفنی"</item>
+    <item msgid="8181415497109310680">"خواندن پیامک"</item>
+    <item msgid="6816551144382117307">"نوشتن پیامک"</item>
+    <item msgid="4600463921908905030">"دریافت پیامک"</item>
+    <item msgid="5958926493289432745">"دریافت پیامک‌های اضطراری"</item>
+    <item msgid="4945269495221089540">"دریافت MMS"</item>
+    <item msgid="5570472453573929087">"دریافت پیام ارسال داده WAP"</item>
+    <item msgid="7125408150230860501">"ارسال پیامک"</item>
+    <item msgid="7080337936612188061">"خواندن پیامک ICC"</item>
+    <item msgid="587124103118495063">"نوشتن پیامک ICC"</item>
+    <item msgid="2320577158869025503">"اصلاح تنظیمات"</item>
+    <item msgid="1545733463471924009">"در بالا طراحی کنید"</item>
+    <item msgid="3609046903962454582">"اعلان‌های دسترسی"</item>
+    <item msgid="4671646036128214513">"دوربین"</item>
+    <item msgid="1097324338692486211">"ضبط صدا"</item>
+    <item msgid="5031552983987798163">"پخش صدا"</item>
+    <item msgid="8374996688066472414">"خواندن کلیپ بورد"</item>
+    <item msgid="3045529469061083747">"اصلاح کلیپ‌بورد"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"موقعیت مکانی"</item>
+    <item msgid="8677040780775113033">"موقعیت مکانی"</item>
+    <item msgid="1660743989948992916">"موقعیت مکانی"</item>
+    <item msgid="8791172739860195290">"لرزش"</item>
+    <item msgid="383413555642128046">"خواندن مخاطبین"</item>
+    <item msgid="3654594895269697313">"اصلاح مخاطبین"</item>
+    <item msgid="7928393476362362538">"خواندن گزارش تماس"</item>
+    <item msgid="6248591205254641116">"اصلاح گزارش تماس"</item>
+    <item msgid="6093344633066170692">"خواندن تقویم"</item>
+    <item msgid="1334886368750347692">"اصلاح تقویم"</item>
+    <item msgid="1638204101698708656">"موقعیت مکانی"</item>
+    <item msgid="2154671955760380322">"اعلان پست"</item>
+    <item msgid="4282477730595931828">"موقعیت مکانی"</item>
+    <item msgid="4891423912898525905">"تماس تلفنی"</item>
+    <item msgid="626463821668200388">"دریافت پیامک/MMS"</item>
+    <item msgid="1237538540368797101">"ارسال پیامک/MMS"</item>
+    <item msgid="3986142739951490025">"دریافت پیامک/MMS"</item>
+    <item msgid="3984213795861739778">"دریافت پیامک/MMS"</item>
+    <item msgid="3656243523752472788">"دریافت پیامک/MMS"</item>
+    <item msgid="8105802370238551510">"دریافت پیامک/MMS"</item>
+    <item msgid="1407766984645388488">"ارسال پیامک/MMS"</item>
+    <item msgid="1530132603376027248">"دریافت پیامک/MMS"</item>
+    <item msgid="1188256962149204607">"ارسال پیامک/MMS"</item>
+    <item msgid="4218544235221631789">"تغییر تنظیمات"</item>
+    <item msgid="736541391767350377">"در بالا طراحی کنید"</item>
+    <item msgid="5530815681721654194">"اعلان‌های دسترسی"</item>
+    <item msgid="781213371706962767">"دوربین"</item>
+    <item msgid="1720492593061838172">"ضبط صدا"</item>
+    <item msgid="3493046322001257041">"پخش صدا"</item>
+    <item msgid="136815868796597058">"خواندن کلیپ بورد"</item>
+    <item msgid="5238692940326972503">"اصلاح کردن کلیپ بورد"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"کوتاه"</item>
     <item msgid="2560532955514699713">"متوسط"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (تصاویر گرافیکی)"</item>
     <item msgid="1340692776955662664">"فراخوانی پشته در glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"بر روی صفحه نمایش بصورت نوار"</item>
+    <item msgid="8272260411216018353">"بر روی صفحه نمایش بصورت خط"</item>
+    <item msgid="120512413928262547">"در adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"حد استاندارد"</item>
     <item msgid="4071574792028999443">"بدون پردازش در پس‌زمینه"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 34f2617..7012916 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"حالت هواپیما"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"بیشتر..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"بی‌سیم و شبکه‌ها"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکه‌های تلفن همراه، و VPN ها"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکه‌های تلفن همراه، و VPNها"</string>
     <string name="roaming" msgid="3596055926335478572">"رومینگ داده"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"اتصال به سرویس‌های داده هنگام رومینگ"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"متنی را وارد کنید تا در صفحه قفل شده نشان داده شود"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"نمایش اطلاعات کاربر بر روی صفحه قفل"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"اطلاعات کاربر"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"نمایش اطلاعات نمایه در صفحه قفل"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"اطلاعات نمایه"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"دسترسی به موقعیت مکانی"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"امنیت"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
@@ -351,7 +353,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"اسلاید"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"عدم وجود امنیت"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlockj"</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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"سرپرستی دستگاه"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"سرپرست های دستگاه"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"مشاهده یا غیر فعال کردن سرپرست های دستگاه"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"دسترسی به اعلان"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"روشن کردن بلوتوث"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"بلوتوث"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"به خاطر سپردن تنظیمات"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"نمایش بی‌سیم"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"برای دیدن دستگاه‌ها، صفحه‌نمایش بی‌سیم را روشن کنید."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"صفحه نمایش بی‌سیم غیرفعال است زیرا Wi-Fi خاموش است."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"صفحه نمایش بی‌سیم غیرفعال است زیرا Wi-Fi خاموش است."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"جستجوی صفحه نمایش‌ها"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"در حال جستجو..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"هیچ صفحه نمایش بی‌سیمی در این نزدیکی یافت نشد."</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"روشن کردن Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"تنظیمات Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"روشن کردن Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"تنظیمات Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"تنظیم و مدیریت نقاط دسترسی بی سیم"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"انتخاب Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"روشن کردن Wi-Fi؟؟؟"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"خاموش کردن Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"انتخاب Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"روشن کردن Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"خاموش کردن Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"خطا"</string>
     <string name="wifi_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="3038290727701553612">"هنگام در دسترس بودن یک شبکه باز، به من اعلام شود"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"اجتناب از اتصالات ضعیف"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"تنها در صورتی که اتصال اینترنت خوب باشد از شبکه Wi-Fi استفاده شود"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"هنگام خواب، Wi-Fi همچنان روشن باشد"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"از شبکه Wi-Fi استفاده نکنید، مگر آنکه اتصال اینترنتی مناسب باشد"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"اسکن کردن همواره در دسترس باشد"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"به خدمات موقعیت مکانی و دیگر برنامه‌های Google اجازه می‌دهد برای یافتن شبکه‌ها حتی هنگامی که Wi-Fi خاموش است، جستجو کنند."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"نصب گواهی‌ها"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"برای بهبود میزان دقت موقعیت مکانی و به منظور اهداف دیگر، Google و سایر برنامه‌ها ممکن است شبکه‌های نزدیک را اسکن کنند، حتی وقتی Wi-Fi خاموش است. اگر نمی‌خواهید چنین شود، به پیشرفته &gt; همیشه اسکن موجود باشد، بروید."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"برنامه‌ها ممکن است شبکه‌های نزدیک را اسکن کنند، حتی زمانی که Wi-Fi خاموش است. اگر نمی‌خواهید چنین شود، به پیشرفته &gt; همیشه اسکن موجود باشد، بروید."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"دوباره نشان داده نشود"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"هنگام خواب، Wi-Fi را روشن بگذارید"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"هنگام تغییر تنظیمات مشکلی رخ داد"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"بهینه‌سازی Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"به حداقل رساندن مصرف باتری زمانی که Wi-Fi روشن است"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"بهینه‌سازی Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"به حداقل رساندن مصرف باتری زمانی که Wi-Fi روشن است"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"افزودن شبکه"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"شبکه‌های Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"شبکه‌های Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"دکمه ارسال WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"گزینه‌های بیشتر"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ورودی پین WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"فراموش کردن شبکه"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"اصلاح کردن شبکه"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"برای مشاهده شبکه‌های در دسترس، Wi-Fi را روشن کنید."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"در حال جستجوی شبکه‌های Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"برای مشاهده شبکه‌های در دسترس، Wi-Fi را روشن کنید."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"در حال جستجوی شبکه‌های Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"‫اجازه ندارید شبکه Wi‑Fi را تغییر دهید."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"شبکه‌ای دیگر…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"بیشتر"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"تنظیم خودکار (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"برای تکمیل نصب، رایانه لوحی شما باید به Wi-Fi دسترسی پیدا کند. بعد از نصب، می‌توانید بین داده‌های تلفن همراه و Wi-Fi جابجا شوید."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"برای تکمیل تنظیم، رایانه لوحی شما نیاز به دسترسی به Wi-Fi دارد. پس از تنظیم، می‌توانید داده‌های تلفن همراه و Wi-Fi را با یکدیگر تعویض نمایید."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"نمایش گزینه‌های پیشرفته"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"نصب Wi-Fi حفاظت شده"</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="7204827509934892103">"دکمه تنظیم محافظت شده Wi-Fi را در مسیریاب خود فشار دهید. این دکمه ممکن است «WPS» نامیده شود یا دارای این نماد باشد:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"پین <xliff:g id="NUMBER">%1$s</xliff:g> را در روتر Wi-Fi خود وارد کنید. تکمیل نصب ممکن است حداکثر دو دقیقه طول بکشد."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"دکمه 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="5754399645462924103">"به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"به شبکه Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS در حال انجام عملیات است و ممکن است حداکثر دو دقیقه طول بکشد تا کاملاْ انجام شود."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS انجام نشد. لطفاً چند دقیقه دیگر دوباره امتحان کنید."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"تنظیمات امنیتی روتر بیسیم (WEP) پشتیبانی نمی‌شود"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"تأیید اعتبار انجام نشد. لطفاً دوباره امتحان کنید."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"یک جلسه WPS دیگر شناسایی شد. لطفاً پس از چند دقیقه دوباره امتحان کنید."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"‏SSID شبکه"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID را وارد کنید"</string>
     <string name="wifi_security" msgid="6603611185592956936">"امنیت"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"قدرت سیگنال"</string>
     <string name="wifi_status" msgid="4824568012414605414">"وضعیت"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"مجاز"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"رد کردن"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"اتصال"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"فراموش کردن"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"رد نمی‌شوید"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"اخطار: ممکن است هزینه‌ حامل مخابراتی اضافی از شما دریافت شود."\n\n"راه‌اندازی رایانه لوحی ممکن است به فعالیت شبکه قابل‌ توجهی نیاز داشته باشد."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"اخطار: ممکن است هزینه‌ حامل مخابراتی اضافی از شما دریافت شود."\n\n"راه‌اندازی تلفن ممکن است به فعالیت شبکه قابل‌ توجهی نیاز داشته باشد."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"اخطار: رایانه لوحی به‌روز بودن نرم‌افزار شما را تأیید نمی‌کند."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"اخطار: تلفن نمی‌تواند به‌روز بودن نرم‌افزار شما را تأیید کند."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"رایانه لوحی قادر به اتصال به این شبکه Wi-Fi نیست."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"تلفن قادر به اتصال به این شبکه Wi-Fi نیست."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi پیشرفته"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"باند فرکانس Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"هشدار: تا زمانی که به اینترنت متصل نشوید، رایانه لوحی نمی‌تواند تشخیص دهد که نرم‌افزار شما به‌روز است."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"هشدار: تا زمانی که به اینترنت متصل نشوید، تلفن نمی‌تواند تشخیص دهد که نرم‌افزار شما به‌روز است."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"رایانه لوحی قادر به اتصال به این شبکه Wi-Fi نیست."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"تلفن قادر به اتصال به این شبکه Wi-Fi نیست."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi پیشرفته"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"باند فرکانس Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"تعیین دامنه فرکانس عملکرد"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"مشکلی در تنظیم باند فرکانس روی داد."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"آدرس MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"دروازه"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"طول پیشوند شبکه"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"اطلاعات دستگاه"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"به یادسپاری این ارتباط"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"جستجوی دستگاه‌ها"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا می‌خواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"این گروه فراموش شود؟"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال Wi-Fi قابل حمل"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"نقطه اتصال قابل حمل Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"در حال روشن کردن نقطه اتصال…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"در حال خاموش کردن نقطه اتصال…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطه اتصال قابل حمل <xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطای نقطه اتصال Wi-Fi قابل حمل"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"تنظیم نقطه اتصال Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"خطای نقطه اتصال قابل حمل Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"تنظیم نقطه اتصال 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="display_settings_title" msgid="1708697328627382561">"صفحهٔ نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"قدرت سیگنال"</string>
     <string name="status_roaming" msgid="2638800467430913403">"رومینگ"</string>
     <string name="status_operator" msgid="2274875196954742087">"شبکه"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"آدرس Wi-Fi MAC"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"آدرس Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"آدرس بلوتوث"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"شمارهٔ سریال"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"در دسترس نیست"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN فعال شد"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN غیرفعال شد"</string>
     <string name="bearer" msgid="594270280031923558">"حامل"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"نوع MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"مقدار MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"حذف APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN جدید"</string>
     <string name="menu_save" msgid="8109345640668285399">"ذخیره"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"راهنمایی"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"شبکه‌های تلفن همراه"</string>
     <string name="location_title" msgid="1029961368397484576">"موقعیت مکانی شما"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"مکان شبکهٔ تلفن همراه و Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"به برنامه‌ها اجازه داده شود با استفاده از خدمات مکانی Google مکان شما را سریع‌تر تخمین بزنند. داده‌های مکان به‌طور ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"ماهواره‌های GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"به برنامه‌های کاربردی اجازه داده شود برای مشخص کردن دقیق مکان شما از GPS رایانه لوحیتان استفاده کنند"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"به برنامه‌های کاربردی اجازه داده شود برای مشخص کردن دقیق مکان شما از GPS تلفن همراه شما استفاده کنند"</string>
@@ -1016,9 +1040,9 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"الگوی بازگشایی قفل"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"درخواست الگو"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"برای باز کردن قفل صفحه باید یک الگو بکشید"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"الگو را قابل مشاهده کنید"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"الگو مرئی باشد"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"لرزش هنگام لمس"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"دکمه روشن/خاموش فوراً دستگاه را قفل کند"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"قفل‌شدن فوری با دکمه روشن/خاموش"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"تنظیم الگوی بازگشایی قفل"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"تغییر الگوی بازگشایی قفل"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"نحوه ترسیم الگوی بازگشایی قفل"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"فیلتر"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"انتخاب گزینه‌های فیلتر"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"همه"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"غیرفعال شد"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"دانلودشده"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"در حال اجرا"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"حافظهٔ USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"در صورتی که یک برنامه داخلی را غیرفعال کنید، ممکن است برنامه‌های دیگری هم دچار مشکل شوند. داده‌های شما نیز حذف خواهند شد."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"خاموش کردن اعلان‌ها؟"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"اگر اعلانی را برای این برنامه خاموش کنید، ممکن است هشدارها و به‌روزرسانی‌های مهم را از دست بدهید."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"کارکرد برنامه"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"درحال اجرا"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(هرگز استفاده نشده است)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"استفاده از حافظه"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"مشاهده حافظه مورد استفاده برنامه‌ها"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"سرویس‌های در حال اجرا"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"کلمه:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"میانبر:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"زبان:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"یک کلمه تایپ کنید"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"میانبر اختیاری"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ویرایش کلمه"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ویرایش"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"حذف"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"تنظیمات صفحه‌کلید فیزیکی"</string>
     <string name="development_settings_title" msgid="215179176067683667">"گزینه‌های برنامه‌نویسان"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"تنظیم گزینه‌های مربوط به طراحی برنامه"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"گزینه‌های برنامه‌نویس برای این کاربر موجود نیست"</string>
     <string name="enable_adb" msgid="7982306934419797485">"رفع عیب USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"با اتصال USB حالت رفع عیب فعال شود"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"لغو مجوزهای اشکال‌زدایی USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"گزارش‌های اشکال در منوی نیرو"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"گزینه‌ای در منوی نیرو برای گرفتن گزارش اشکال اضافه شود"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"بیدار ماندن"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"تنظیمات برنامه‌نویسی مجاز باشد؟"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"این تنظیمات فقط برای برنامه‌نویسی در نظر گرفته شده است. ممکن است استفاده از این تنظیمات موجب خرابی یا عملکرد نادرست دستگاه یا برنامه‌های شما شود."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"تأیید برنامه‌های نصب شده از طریق USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"بزرگنمایی صفحه"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"به‌روزرسانی خودکار بزرگنمایی صفحه"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"به‌روزرسانی بزرگنمایی صفحه در انتقال‌های برنامه"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"دکمه روشن/خاموش به تماس پایان می‌دهد"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"قطع تماس با دکمه روشن/خاموش"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"گفتن گذرواژه‎ها"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"تأخیر لمس کردن و نگه داشتن"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"بهبود قابلیت دسترسی وب"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"تنظیمات"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"فعال"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"غیرفعال"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"مجاز"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"مجاز نیست"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"اجازه داده شود"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"اجازه داده نشود"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"استفاده از <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> می‌تواند تمام نوشتارهایی که تایپ می‌کنید، به جز گذرواژه‌ها، را جمع‌آوری کند. این نوشتارها شامل داده‌های شخصی مانند شماره‌های کارت اعتباری نیز می‌شوند. این برنامه همچنین می‌تواند داده‌های تعاملات شما را با رایانهٔ لوحی جمع‌آوری کند."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> می‌تواند تمام نوشتارهایی که تایپ می‌کنید، به جز گذرواژه‌ها، را جمع‌آوری کند. این نوشتارها شامل داده‌های شخصی مانند شماره‌های کارت اعتباری نیز می‌شوند. این برنامه همچنین می‌تواند داده‌های تعاملات شما را با تلفن جمع‌آوری کند."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"توقف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"با لمس کردن تأیید، <xliff:g id="SERVICE">%1$s</xliff:g> متوقف خواهد شد."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"عملکردهای خود را مشاهده کنید"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"دریافت اعلان وقتی در حال تعامل با برنامه‌ای هستید."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> متوقف شود؟"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"با لمس کردن تأیید، <xliff:g id="SERVICE">%1$s</xliff:g> متوقف خواهد شد."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"سرویسی نصب نشده است"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"به صفحه‌خوان نیاز دارید؟"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback یک بازخورد شفاهی برای کمک به کاربران نابینا و کم‌بینا ارائه می‌دهد. آیا می‌خواهید آن را به صورت رایگان از Android Market نصب کنید؟"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"آیا می‌خواهید برنامه‌های کاربردی، اسکریپت‌ها را از Google نصب کنند که امکان دسترسی به محتوای وب آن‌ها بیشتر شود؟"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"توضیحی ارائه نشده است."</string>
     <string name="settings_button" msgid="3006713718908152930">"تنظیمات"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"باتری"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"شارژ کردن"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"صفحه روشن"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS در"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"بیدار"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"سیگنال شبکهٔ تلفن همراه"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi به موقع"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi به موقع"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi به موقع"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi به موقع"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"اطلاعات سابقه"</string>
     <string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"تنظیم استفاده از نیرو"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"شامل بسته ها"</string>
     <string name="power_screen" msgid="3023346080675904613">"صفحهٔ نمایش"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"بلوتوث"</string>
     <string name="power_cell" msgid="6596471490976003056">"حالت آماده به کار تماس"</string>
     <string name="power_phone" msgid="5392641106474567277">"تماس‌های صوتی"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"پیش زمینه CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"بیدار باش"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi در حال اجرا"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi در حال اجرا"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"رایانهٔ لوحی"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"تلفن"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"داده ارسال شده"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"اطلاعات برنامه"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"تنظیمات برنامه"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"تنظیمات صفحهٔ نمایش"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"تنظیمات Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"تنظیمات Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"تنظیمات بلوتوث"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"باتری استفاده شده توسط تماس‌های صوتی"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"باتری استفاده شده در حالت آماده به کار رایانهٔ لوحی"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"در مکان‌هایی که هیچ پوشش تلفن همراه وجود نداد، به حالت هواپیما جابجا می‌شود"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"باتری استفاده شده توسط صفحهٔ نمایش و نور پس‌زمینه"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"روشنایی و یا فاصله زمانی صفحه را کاهش دهید"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"باتری استفاده شده توسط Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"هنگامی که از Wi-Fi استفاده نمی‌کنید یا در دسترس نیست، آن را خاموش کنید"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"باتری مورد استفاده توسط Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"هنگام عدم استفاده از Wi-Fi یا در دسترس نبودن آن را خاموش کنید"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"باتری توسط بلوتوث استفاده می‌شود"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"هنگامی که از بلوتوث استفاده نمی‌کنید آن را خاموش کنید"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"اتصال به یک دستگاه بلوتوث دیگر را امتحان کنید"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"پیکربندی"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"انتخاب یک موتور دیگر"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"این موتور ترکیب صوتی ممکن است بتواند تمام متن گفته شده را جمع‌آوری کند، از جمله اطلاعات شخصی مانند رمزهای ورود و شماره‌های کارت اعتباری. این کارها توسط موتور<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> انجام می‌شود. استفاده از این موتور ترکیب صوتی را فعال می‌کنید؟"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"این زبان به یک اتصال شبکه فعال برای خروجی نوشتار به گفتار نیاز دارد."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"موتورها"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> تنظیمات"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> فعال است"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"موتور ترجیحی"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"کلی"</string>
     <string name="gadget_title" msgid="5519037532720577836">"کنترل نیرو"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"به‌روزرسانی تنظیمات Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"به‌روزرسانی تنظیم Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"به‌روزرسانی تنظیمات بلوتوث"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"فعال"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"غیرفعال"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"روشن کردن"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"در حال خاموش کردن"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"بلوتوث"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"همگام‌سازی"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"حذف تمام گواهی‌ها"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"اطلاعات کاربری قابل اطمینان"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"نمایش گواهی‌های CA قابل اطمینان"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"نوع ذخیره‌سازی"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"سخت‌افزاری"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"فقط نرم‌افزاری"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"رسم الگوی بازگشایی"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"باید الگوی بازگشایی را رسم کنید تا نصب مدارک صلاحیت تأیید شود."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"تهیهٔ نسخهٔ پشتیبان و بازیابی"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"اطلاعات شخصی"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"تهیهٔ نسخهٔ پشتیبان از داده‌های شما"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"تهیهٔ نسخهٔ پشتیبان از داده‌های برنامه، گذرواژه‌های Wi-Fi و سایر تنظیمات در سرورهای Google"</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="auto_restore_title" msgid="5397528966329126506">"بازیابی خودکار"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"گذرواژه جدید و تأیید آن با یکدیگر مطابقت ندارند"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"گذرواژه نسخه پشتیبانی تنظیم نشد"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"تهیهٔ نسخهٔ پشتیبان را از گذرواژه‌های Wi-Fi، نشانک‌ها و سایر تنظیمات خود و همچنین داده‌های برنامه متوقف می‌کنید و تمام نسخه‌های موجود در سرورهای Google را نیز پاک می‌کنید؟"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"تهیهٔ نسخهٔ پشتیبان از گذرواژه‌های Wi-Fi، نشانک‌ها، سایر تنظیمات و همچنین داده‌های برنامه را متوقف می‌کنید، به علاوه تمام نسخه‌های موجود در سرورهای Google را نیز پاک می‌نمایید؟"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"تنظیمات سرپرستی دستگاه"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"سرپرست دستگاه"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"غیرفعال کردن"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"اعلان‌ها"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"لرزش و آهنگ زنگ تماس"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"سیستم"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"تنظیم Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"اتصال به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"اتصال به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"تنظیم Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"اتصال به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"در حال اتصال به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"به شبکه Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"افزودن یک شبکه"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"متصل نیست"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"افزودن شبکه"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"در حال اتصال..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"رفتن به مرحله بعدی"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP پشتیبانی نمی‌شود."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"در حین مراحل نصب نمی‌توانید یک اتصال EAP Wi-Fi را پیکربندی کنید. پس از نصب، این کار را می‌توانید از طریق تنظیمات &gt; بی‌سیم و شبکه‌هاانجام دهید."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"در حین مراحل تنظیم نمی‌توانید یک اتصال EAP Wi-Fi پیکربندی کنید. پس از تنظیم، این کار را می‌توانید از طریق تنظیمات &gt; بی‌سیم و شبکه‌ها انجام دهید."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"اتصال چند دقیقه طول می‌کشد..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"برای ادامه تنظیم، "<b>"بعدی"</b>" را لمس کنید."\n\n" برای اتصال به یک شبکه Wi-Fi دیگر، "<b>"برگشت"</b>" را لمس کنید."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"برای ادامه تنظیم "<b>"بعدی"</b>" را لمس نمایید."\n\n"برای اتصال به یک شبکه Wi-Fi دیگر "<b>"بازگشت"</b>" را لمس کنید."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"همگام‌سازی فعال شد"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"همگام‌سازی غیر فعال شد"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطای همگام‌سازی."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"برنامه اشکال‌زدایی شده منتظر پیوست شدن اشکال‌زدا قبل از اجرا است"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"ورودی"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"طراحی"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"سخت‌افزار تولید تصویر سریع"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"نظارت"</string>
     <string name="strict_mode" msgid="1938795874357830695">"حالت شدید فعال شد"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"چشمک زدن صفحه هنگام انجام عملیات طولانی توسط برنامه‌ها در رشته اصلی"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"از بهترین تا بدترین: آبی، سبز، قرمز روشن، قرمز"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"غیر فعال کردن پوشش HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"همیشه از GPU در ترکیب صفحه استفاده شود"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"فعال کردن ردیابی"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"انتخاب ردیابی‌های فعال"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"هیچ ردیابی در حال حاضر فعال نیست"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> ردیابی در حال حاضر فعال است"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"همه ردیابی‌ها در حال حاضر فعال هستند"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"فعال کردن ردیابی‌های OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"نمایش محدوده‌های طرح‌بندی"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"نمایش مرزها، حاشیه‌ها و ویژگی‌های دیگر کلیپ."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"استفاده اجباری از GPU برای طراحی دوم"</string>
     <string name="force_msaa" msgid="7920323238677284387">"تحمیل 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"فعال کردن 4X MSAA در برنامه‌های OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"رفع اشکال عملکردهای کلیپ غیر مربع شکل"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"اجرای GPU نمایه"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"اندازه‌گیری زمان اجرا در adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"مقیاس انیمیشن پنجره"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"مقیاس انیمیشن انتقال"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"مقیاس طول مدت انیماتور"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"محدودیت پردازش در پس‌زمینه"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"نمایش تمام ANRها"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"نمایش گفتگوی \"برنامه پاسخ نمی‌دهد\" برای برنامه‌های پس‌زمینه"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"‫کار با WebView آزمایشی"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"‫برنامه‌ها با جدیدترین WebView (بتا) کار می‌کنند"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"مصرف داده"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"چرخهٔ استفاده از داده"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"رومینگ داده"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"محدود کردن داده‌های پس‌زمینه"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"استفاده جداگانه از 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"نمایش استفاده Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"نمایش استفاده از Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"نمایش استفاده از اترنت"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"نقاط اتصال تلفن همراه"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"همگام‌سازی خودکار داده"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"تنظیم محدودیت داده تلفن همراه"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"تنظیم محدودیت داده 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"تنظیم محدودیت داده 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"تنظیم محدودیت داده Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"تنظیم محدودیت داده Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"اترنت"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"تلفن همراه"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط رایانهٔ لوحی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"زمانی که مقدار تعیین شده استفاده از داده برای شما به پایان برسد، اتصال داده‌ شما تلفن همراه شما غیرفعال می‌شود."\n\n"از آنجا که مقدار استفاده از داده، توسط گوشی شما محاسبه شده است و شرکت مخابراتی شما ممکن است استفاده از داده را به صورت دیگری محاسبه کند، لطفاً سقف محتاطانه‌تری را در نظر بگیرید."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"محدود کردن داده‌های پس‌زمینه؟"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"در صورت محدود کردن داده‌های تلفن همراه در پس‌زمینه، برخی از برنامه‌های کاربردی و سرویس‌ها کار نمیکنند مگر آنکه به شبکه Wi-Fi متصل شوید."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"اگر شما داده‌های تلفن همراه پس‌زمینه را محدود کنید، برخی از برنامه‌ها و سرویس‌ها تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n" این تنظیم روی همه کاربران موجود در این رایانه لوحی تأثیر می‌گذارد."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"اگر شما داده‌های تلفن همراه پس‌زمینه را محدود کنید، برخی از برنامه‌ها و سرویس‌ها تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n" این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"اگر داده‌های پس‌زمینه تلفن همراه را محدود کنید، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"در صورت محدود کردن داده‌های پس‌زمینه تلفن همراه، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n" این تنظیم درمورد همه کاربران موجود در این رایانه لوحی اعمال می‌شود."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"اگر داده‌های پس‌زمینه تلفن همراه را محدود کنید، برخی از برنامه‌ها و خدمات تنها در صورتی کار می‌کنند که به یک شبکه Wi-Fi متصل شوید."\n\n"این تنظیم درمورد همه کاربران موجود در این تلفن اعمال می‌شود."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"هشدار"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"محدودیت"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"برنامه‌های حذف شده"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g>، براساس محاسبه رایانهٔ لوحی شما، استفاده شده است. ممکن است روش محاسبهٔ مقدار استفاده از داده توسط شرکت مخابراتی شما متفاوت باشد."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: در حدود <xliff:g id="TOTAL">%1$s</xliff:g>، براساس محاسبه گوشی شما، استفاده شده است. ممکن است روش محاسبهٔ مقدار استفاده از داده توسط شرکت مخابراتی شما متفاوت باشد."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"نقاط اتصال تلفن همراه"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"شبکه‌های Wi-Fi را انتخاب کنید که نقاط اتصال تلفن همراه هستند. هنگامی که برنامه‌ها در پس‌زمینه هستند، استفاده آن‌ها از این شبکه‌ها ممکن است محدود شود. همچنین زمانی که برنامه‌ها بخواهند از این شبکه‌ها برای دانلودهای بزرگ استفاده کنند، ممکن است به شما هشدار دهند."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"آن دسته از شبکه‌های Wi-Fi را انتخاب کنید که نقاط اتصال تلفن همراه هستند. هنگامی که برنامه‌ها در پس‌زمینه اجرا می‌شوند، می‌توان استفاده آن‌ها از این شبکه‌ها را محدود کرد. همچنین زمانی که بخواهید از این شبکه‌ها برای دانلودهای بزرگ استفاده کنید، برنامه‌ها ممکن است هشدار دهند."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"شبکه‌های تلفن همراه"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"شبکه‌های Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"برای انتخاب نقاط اتصال تلفن همراه، Wi-Fi را روشن کنید."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"شبکه‌های Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"برای انتخاب نقاط اتصال تلفن همراه، Wi-Fi را روشن کنید."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"تماس اضطراری"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"بازگشت به تماس"</string>
     <string name="vpn_name" msgid="4689699885361002297">"نام"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"مجاز"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"در حال اعمال"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"کاربران"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"شما"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"کاربران دیگر"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"افزودن کاربر"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"فعال"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"غیرفعال"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"کاربران و نمایه‌ها"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"افزودن کاربر یا نمایه"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"نمایهٔ محدودشده"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"قبل از ایجاد یک نمایه محدود، باید یک قفل صفحه را برای محافظت از برنامه‌ها و داده‌های شخصی خود تنظیم کنید."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"تنظیم قفل"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"تنظیم نشده"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"تنظیم نشده است - نمایهٔ محدودشده"</string>
     <string name="user_owner" msgid="3879126011135546571">"مالک"</string>
+    <string name="user_you" msgid="1639158809315025986">"شما (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"نام مستعار"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"افزودن"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"کاربران دارای برنامه‌ها و محتوای متعلق به خود هستند"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"می‌توانید از حساب خود دسترسی به برنامه‌ها و محتوا را محدود کنید"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"کاربر"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"نمایه محدود شده"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"اضافه کردن کاربر جدید"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"شما می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود دارد و می‌تواند این فضا را با برنامه‌ها، تصویر زمینه و موارد دیگر خود سفارشی کند. کاربران همچنین می‌توانند تنظیماتی را در رایانه لوحی ایجاد کنند که بر همه کاربرها تأثیر می‌گذارد، مانند Wi-Fi."\n\n"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد."\n\n"هر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف همه کاربران دیگر بپذیرد."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"شما می‌توانید با ایجاد کاربران اضافی، این دستگاه را با سایر افراد به اشتراک بگذارید. هر کاربر فضای مخصوص به خود را دارد و می‌تواند این فضا را با برنامه‌ها، تصاویر زمینه و موارد دیگر خود سفارشی کند. کاربران همچنین می‌توانند تنظیماتی، مانند Wi-Fi، را در رایانه لوحی ایجاد کنند که بر همه کاربران تأثیر می‌گذارد."\n\n"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد."\n\n"هر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف سایر کاربران بپذیرد."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"بعد از ایجاد یک کاربر جدید، آن شخص باید مرحله تنظیم را انجام دهد."\n\n"هر کاربر می‌تواند مجوزهای برنامه به‌روز شده را از طرف سایر کاربران بپذیرد."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"هم اکنون کاربر تنظیم شود؟"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"اطمینان حاصل کنید که فرد برای گرفتن رایانه لوحی و تنظیم فضای خود، در دسترس است"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"اکنون نمایه را تنظیم می‌کنید؟"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"هم اکنون تنظیم شود"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"اکنون خیر"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"فقط صاحب رایانه لوحی می‌تواند کاربران را مدیریت کند."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"فقط صاحب گوشی می‌تواند کاربران را مدیریت کند."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"نمایه‌های محدود نمی‌توانند حسابی را اضافه کنند"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"حذف <xliff:g id="USER_NAME">%1$s</xliff:g> از این دستگاه"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"کاربر جدید"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"نمایه جدید"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"حذف خودتان؟"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"حذف کاربر؟"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"نمایه حذف شود؟"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"داده‌ها و فضای خود را در این رایانه لوحی از دست می‌دهید. شما نمی‌توانید این عملکرد را لغو کنید."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"داده‌ها و فضای خود را در این تلفن از دست می‌دهید. شما نمی‌توانید این عملکرد را لغو کنید."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"این داده‌ها و فضای کاربر از این رایانه لوحی پاک می‌شود. شما نمی‌توانید این عملکرد را لغو کنید."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"این داده‌ها و فضای کاربر از این تلفن پاک می‌شود. شما نمی‌توانید این عملکرد را لغو کنید."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"داده‌ها و فضای این نمایه از این رایانه لوحی پاک می‌شوند. واگرد این عملکرد ممکن نیست."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"داده‌ها و فضای این نمایه در این گوشی پاک می‌شوند. واگرد این عملکرد ممکن نیست."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"درحال اضافه کردن کاربران جدید..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"حذف کاربر"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"حذف"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"اجازه به برنامه‌ها و محتوا"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"برنامه‌های دارای محدودیت"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"توسعه تنظیمات برای برنامه"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"این تنظیم روی همه کاربران موجود در این رایانه لوحی تأثیر می‌گذارد."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"این تنظیم روی همه کاربران موجود در این تلفن تأثیر می‌گذارد."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"تغییر زبان"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"کارت شناسایی عکس‌دار"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"پخش‌های سلولی"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"انواع هشدارهای اضطراری را برای نمایش انتخاب کنید."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"محدودیت‌های محتوا و برنامه"</string>
+    <string name="user_rename" msgid="8523499513614655279">"تغییر نام"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"تنظیم محدودیت‌های برنامه"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"تغییرات در تنظیمات و مرتبط‌سازی بلوتوث مجاز است"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"اجازه برای تبادل داده‌ها هنگامی که رایانه لوحی دستگاه دیگری را لمس می‌کند"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"اجازه برای تبادل داده‌ها هنگامی که تلفن دستگاه دیگری را لمس می‌کند"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"دسترسی به موقعیت مکانی"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"اجازه به برنامه‌ها برای استفاده از اطلاعات موقعیت مکانی شما"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"بازگشت"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"بعدی"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"پایان"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"عکس گرفتن"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"انتخاب عکس از گالری"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 41dfd36..a07a248 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Hidas"</item>
     <item msgid="1145554631248513562">"Normaali"</item>
     <item msgid="7553665153391107454">"Nopea"</item>
-    <item msgid="2538100882620724753">"Hyvin nopea"</item>
+    <item msgid="1370673569131070146">"Nopeampi"</item>
+    <item msgid="4648206845228970803">"Hyvin nopea"</item>
+    <item msgid="4977949754169483251">"Nopea"</item>
+    <item msgid="6106302964845503577">"Erittäin nopea"</item>
+    <item msgid="6800277205640837264">"Nopein"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Hyvin matala"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"–"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ei mitään"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Määrittelemätön"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ei mitään"</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">"Laitteen sisäinen tallennustila"</item>
     <item msgid="3738430123799803530">"Poistettava SD-kortti"</item>
     <item msgid="4498124044785815005">"Anna järjestelmän päättää"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Sijainti"</item>
+    <item msgid="255608127647030286">"Henkilökohtaiset"</item>
+    <item msgid="4588829735729884491">"Viestit"</item>
+    <item msgid="8971765125227378270">"Laite"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"karkea sijainti"</item>
+    <item msgid="5789673140227507995">"tarkka sijainti"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"värinä"</item>
+    <item msgid="3434165993711230924">"lue yhteystietoja"</item>
+    <item msgid="616161687718081936">"muokkaa kontakteja"</item>
+    <item msgid="7638002295329050091">"lue puhelulokia"</item>
+    <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="8694611243479480497">"ilmoitus"</item>
+    <item msgid="7776439107987345446">"soluhaku"</item>
+    <item msgid="514615766544675057">"soita numeroon"</item>
+    <item msgid="8181415497109310680">"lue tekstiviestejä"</item>
+    <item msgid="6816551144382117307">"kirjoita tekstiviestejä"</item>
+    <item msgid="4600463921908905030">"vastaanota tekstiviestejä"</item>
+    <item msgid="5958926493289432745">"vastaanota hätätekstiviestejä"</item>
+    <item msgid="4945269495221089540">"vastaanota multimediaviestejä"</item>
+    <item msgid="5570472453573929087">"vastaanota WAP push -viestejä"</item>
+    <item msgid="7125408150230860501">"lähetä tekstiviestejä"</item>
+    <item msgid="7080337936612188061">"lue ICC-tekstiviestejä"</item>
+    <item msgid="587124103118495063">"kirjoita ICC-tekstiviestejä"</item>
+    <item msgid="2320577158869025503">"muokkaa asetuksia"</item>
+    <item msgid="1545733463471924009">"piirrä päälle"</item>
+    <item msgid="3609046903962454582">"käytä ilmoituksia"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"tallenna ääntä"</item>
+    <item msgid="5031552983987798163">"toista ääntä"</item>
+    <item msgid="8374996688066472414">"lue leikepöytä"</item>
+    <item msgid="3045529469061083747">"muokkaa leikepöytää"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Sijainti"</item>
+    <item msgid="8677040780775113033">"Sijainti"</item>
+    <item msgid="1660743989948992916">"Sijainti"</item>
+    <item msgid="8791172739860195290">"Värinä"</item>
+    <item msgid="383413555642128046">"Lue yhteystietoja"</item>
+    <item msgid="3654594895269697313">"Muokkaa kontakteja"</item>
+    <item msgid="7928393476362362538">"Lue puhelulokia"</item>
+    <item msgid="6248591205254641116">"Muokkaa puhelulokia"</item>
+    <item msgid="6093344633066170692">"Lue kalenteria"</item>
+    <item msgid="1334886368750347692">"Muokkaa kalenteria"</item>
+    <item msgid="1638204101698708656">"Sijainti"</item>
+    <item msgid="2154671955760380322">"Lisää ilmoitus"</item>
+    <item msgid="4282477730595931828">"Sijainti"</item>
+    <item msgid="4891423912898525905">"Soita numeroon"</item>
+    <item msgid="626463821668200388">"Vastaanota multimedia- tai tekstiviestejä"</item>
+    <item msgid="1237538540368797101">"Lähetä multimedia- tai tekstiviestejä"</item>
+    <item msgid="3986142739951490025">"Vastaanota multimedia- tai tekstiviestejä"</item>
+    <item msgid="3984213795861739778">"Vastaanota multimedia- tai tekstiviestejä"</item>
+    <item msgid="3656243523752472788">"Vastaanota multimedia- tai tekstiviestejä"</item>
+    <item msgid="8105802370238551510">"Vastaanota multimedia- tai tekstiviestejä"</item>
+    <item msgid="1407766984645388488">"Lähetä multimedia- tai tekstiviestejä"</item>
+    <item msgid="1530132603376027248">"Vastaanota multimedia- tai tekstiviestejä"</item>
+    <item msgid="1188256962149204607">"Lähetä multimedia- tai tekstiviestejä"</item>
+    <item msgid="4218544235221631789">"Muokkaa asetuksia"</item>
+    <item msgid="736541391767350377">"Piirrä päälle"</item>
+    <item msgid="5530815681721654194">"Käytä ilmoituksia"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Tallenna ääntä"</item>
+    <item msgid="3493046322001257041">"Toista ääntä"</item>
+    <item msgid="136815868796597058">"Lue leikepöytä"</item>
+    <item msgid="5238692940326972503">"Muokkaa leikepöytää"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Lyhyt"</item>
     <item msgid="2560532955514699713">"Keskipitkä"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafiikka)"</item>
     <item msgid="1340692776955662664">"Kutsu pinoa, jos glGetError tapaht."</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Pois"</item>
+    <item msgid="675719912558941285">"Piirrä ei-suorakulm. leikealue sinisellä"</item>
+    <item msgid="1064373276095698656">"Korosta testatut piirtokom. vihreällä"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Pois käytöstä"</item>
+    <item msgid="2751513398307949636">"Ruudulla palkkeina"</item>
+    <item msgid="8272260411216018353">"Ruudulla viivoina"</item>
+    <item msgid="120512413928262547">"Adb shell dumpsys gfxinfossa"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Vakioraja"</item>
     <item msgid="4071574792028999443">"Ei taustaprosesseja"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index d050119..be4930d 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Lentokonetila"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Lisää..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Langaton verkko ja verkot"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Hallinnoi wifi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Hallinnoi wifi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming-tiedonsiirto"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Yhdistä verkkoon roaming-tilassa"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Yhdistä verkkoon roaming-tilassa"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kirjoita tekstiä näytettäväksi lukitusruudulla."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Näytä käyttäjän tiedot lukitusruudulla"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Käyttäjätiedot"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Näytä profiilin tiedot lukitusruudulla"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiilin tiedot"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Sijainnin käyttöoikeus"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Suojaus"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Laitteen järjestelmänvalvonta"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Laitteen ylläpitäjät"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Näytä tai poista käytöstä laitteen ylläpitäjiä"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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">"Sovellus %d voi lukea ilmoituksia"</item>
+    <item quantity="other" msgid="980049191810249052">"Sovellukset %d voivat 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ota Bluetooth-yhteys käyttöön"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Muista asetukset"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Langaton näyttö"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Näet laitteet ottamalla langattoman näytön käyttöön."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Langaton näyttäminen ei ole käytössä, koska wifi-yhteyttä ei ole muodostettu."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Langaton näyttö ei ole käytössä, koska wifi-yhteyttä ei ole muodostettu."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Etsi näyttöjä"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Etsitään..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Ei lähellä olevia langattomia näyttöjä."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Kun tämä ominaisuus on käytössä, voit lähettää sovellusten sisältöä toiseen NFC-yhteensopivaan laitteeseen pitämällä laitteita lähekkäin. Voit lähettää esimerkiksi selaimen sivuja, YouTube-videoita ja yhteystietoja."\n\n"Aseta laitteet lähekkäin (yleensä taustat vastakkain) ja kosketa näyttöä. Sovellus määrittää lähetettävät tiedot."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Verkkopalveluhaku"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Anna muiden laitteiden sovelluksien löytää tämän laitteen sovelluksia"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wifi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ota wifi-yhteys käyttöön"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wifi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wifi-asetukset"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wifi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ota wifi käyttöön"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wifi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wifi-asetukset"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Valitse wifi-verkko"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wifiä otetaan käyttöön..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Sammutetaan wifi-yhteyttä…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Valitse wifi-verkko"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wifi-yhteyttä otetaan käyttöön…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Poistetaan wifi-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="3038290727701553612">"Ilmoita, kun avoin verkko on käytettävissä"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys."</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wifi käytössä lepotilassa"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Älä käytä wifi-verkkoa, jos sillä on huono internetyhteys"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Haku aina käytettävissä"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Anna Googlen sijaintipalvelun ja muiden sovellusten hakea verkkoja, vaikka wifi-yhteys olisi pois käytöstä"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Asenna varmenteet"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Voit mm. parantaa Googlen ja muiden sovellusten sijaintitietojen tarkkuutta antamalla luvan etsiä wifi-verkkoja myös silloin, kun wifi ei ole käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Sovellukset voivat etsiä läheisiä verkkoja vaikka wifi ei olisi käytössä. Jos et halua sallia sitä, valitse Lisäasetukset &gt; Etsiminen aina käytössä."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Älä näytä uudelleen"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Pidä wifi käytössä virransäästötilassa"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Asetuksen vaihtaminen epäonnistui"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wifi-optimointi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Vähennä akun kulutusta, kun wifi on käytössä"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wifi-optimointi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Vähennä akun kulutusta, kun wifi on käytössä"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lisää verkko"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wifi-verkot"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wifi-verkot"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-painike"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Lisää asetuksia"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Suora wifi-yhteys"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Suora wifi-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_connect" msgid="4996220309848349408">"Yhdistä verkkoon"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unohda verkko"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Muokkaa verkkoa"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Näet käytettävissä olevat verkot, kun otat wifin käyttöön."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Haetaan wifi-verkkoja..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Näet käyt. olevat verkot, kun otat wifin käyttöön."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Haetaan wifi-verkkoja…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Käyttöoikeutesi eivät riitä wifi-verkon muuttamiseen."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Muu verkko..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lisää"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automaattiset aset. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Asetuksien viimeistelyyn vaaditaan wifi-yhteys. Asetuksien määrittämisen jälkeen voit käyttää mobiiliverkkoyhteyttä tai wifi-yhteyttä."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Asetuksien viimeistelyyn vaaditaan wifi-yhteys. Asetuksien määrittämisen jälkeen voit käyttää mobiiliverkkoyhteyttä tai wifi-yhteyttä."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Näytä lisäasetukset"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Suojatut wifi-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="7204827509934892103">"Paina reitittimen Wi-Fi Protected Setup -painiketta. Siinä voi lukea WPS tai se voi sisältää seuraavan symbolin:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Näppäile wifi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. Asennus voi kestää kaksi minuuttia."</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_pin" msgid="223344506445335358">"Näppäile wifi-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="5754399645462924103">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS on jo käynnissä ja voi kestää kaksi minuuttia"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS epäonnistui. Yritä uudelleen muutaman minuutin kuluttua."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Langattoman reitittimen suojausasetusta (WEP) ei tueta."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Todennusvirhe. Yritä myöhemmin uudelleen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Havaittiin toinen WPS-käyttökerta. Yritä uudelleen muutaman minuutin kuluttua."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Verkon SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Anna SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Suojaus"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaalin vahvuus"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Tila"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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 wifi-yhteys ei ole käytössä."\n\n"Annetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Estä"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Yhdistä"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unohda"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Älä ohita"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"VAROITUS: Voit joutua maksamaan ylimääräisiä tiedonsiirtomaksuja."\n\n"Tablet-laitteen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VAROITUS: Voit joutua maksamaan ylimääräisiä tiedonsiirtomaksuja."\n\n"Puhelimen asetusten määrittäminen voi vaatia paljon tiedonsiirtoa."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"VAROITUS: tablet-laite ei voi tarkistaa, onko ohjelmisto ajan tasalla."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"VAROITUS: puhelin ei voi tarkistaa, onko ohjelmisto ajan tasalla."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Puhelin ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Edistynyt wifi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wifi-taajuusalue"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"VAROITUS: Tablet-laite ei voi vahvistaa, että ohjelmisto on ajan tasalla, ennen kuin muodostat internetyhteyden."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"VAROITUS: Puhelin ei voi vahvistaa, että ohjelmisto on ajan tasalla, ennen kuin muodostat internetyhteyden."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet-laite ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Puhelin ei voi muodostaa yhteyttä tähän wifi-verkkoon."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wifi-lisäasetukset"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wifi-taajuusalue"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Määritä toiminnan taajuusalue"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ongelma taajuusalueen asettamisessa."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-osoite"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Verkon etuliitteen pituus"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Suora wifi-yhteys"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Suora wifi-yhteys"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Laitteen tiedot"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Muista tämä yhteys"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Etsi laitteita"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Peruutetaanko kutsu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Unohdetaanko tämä ryhmä?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kannettava wifi-hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Otetaan yhteyspiste käyttöön..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Poistetaan yhteyspiste käytöstä..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kannettava yhteyspiste <xliff:g id="NETWORK_SSID">%1$s</xliff:g> käytössä"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kannettavan wifi-yhteyspisteen virhe"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Luo wifi-hotspot"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> kannettava wifi-yhteyspiste"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kannettavan wifi-hotspotin virhe"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Luo 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> kannettava wifi-hotspot"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signaalin vahvuus"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Verkko"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wifi-yhteyden MAC-osoite"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wifi-yhteyden MAC-osoite"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-osoite"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sarjanumero"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ei käytettävissä"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN otettu käyttöön"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN poistettu käytöstä"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-tyyppi"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-arvo"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Poista APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Uusi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Tallenna"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ohje"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiiliverkot"</string>
     <string name="location_title" msgid="1029961368397484576">"Oma sijainti"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wifi- ja mobiiliverkkosijainti"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wifi- 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="7457348712272184793">"Sijainti määritetty wifi-yhteyden perusteella"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Sijainti on määritetty wifi-yhteyden perusteella"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satelliitit"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Anna sovellusten määrittää sijaintisi tablet-laitteen GPS:n avulla"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Anna sovellusten määrittää sijaintisi puhelimen GPS:n avulla"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Suodata"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Valitse suodatinvaihtoehdot"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Kaikki"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Ei käytössä"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Ladattu"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Käynnissä"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tallennustila"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Jos poistat sisäänrakennetun sovelluksen, muiden sovellusten toiminta voi häiriintyä. Myös tietosi poistetaan."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Poista ilmoitukset käytöstä?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jos poistat tämän sovelluksen ilmoitukset käytöstä, et välttämättä näe tärkeitä ilmoituksia ja päivityksiä."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Sovellusten toiminta"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Käynnissä"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Ei käytetä)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tallennustilan käyttö"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Näytä sovellusten käyttämä tallennustila."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Käynnissä olevat palvelut"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Sana:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Pikanäppäin:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Kieli:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Kirjoita sana"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Valinnainen pikanäppäin"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Muokkaa sanaa"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Muokkaa"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Poista"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fyysisen näppäimistön asetukset"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Kehittäjävaihtoehdot"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Valitse sovellusten kehittämisasetukset"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Tämä käyttäjä ei voi käyttää kehittäjäasetuksia"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-vianetsintä"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Vianetsintätila USB-liitännän ollessa käytössä"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Peruuta USB-vianetsinnän käyttöoikeudet"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Virheraportit virtavalikossa"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lisää virtavalikkoon virheraportin teko -valinta"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Pysy käynnissä"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Sallitaanko kehittäjäasetukset?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Nämä asetukset on tarkoitettu vain kehityskäyttöön, ja ne voivat aiheuttaa haittaa laitteellesi tai sen sovelluksille."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Tarkista USB:n kautta asennetut"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Virtapainike katkaisee puhelun"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Puhu salasanat"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Pitkäkestoisen kosketuksen viive"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Paranna verkon esteettömyyttä"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Asetukset"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Käytössä"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Pois käyt."</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Sallittu"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ei sallittu"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Salli"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Älä salli"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Otetaanko palvelu <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> voi kerätä kaiken kirjoittamasi tekstin paitsi salasanat. Palvelu voi kerätä myös henkilökohtaisia ​​tietoja, kuten luottokorttien numeroita, sekä tietoja tablet-laitteella tekemistäsi toiminnoista."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> voi kerätä kaiken kirjoittamasi tekstin paitsi salasanat. Palvelu voi kerätä myös henkilökohtaisia ​​tietoja, kuten luottokorttien numeroita, sekä tietoja puhelimella tekemistäsi toiminnoista."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Pysäytetäänkö palvelu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Valinta OK pysäyttää palvelun <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Tarkkaile toimintojasi"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Vastaanota ilmoituksia käyttäessäsi sovellusta."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Pysäytetäänkö palvelu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Valinta OK pysäyttää palvelun <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ei asennettuja palveluita"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Tarvitsetko näytönlukuohjelman?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack auttaa sokeita ja näkörajoitteisia käyttäjiä puhepalautteen avulla. Haluatko asentaa sovelluksen ilmaiseksi Android Marketista?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Haluatko sovellusten asentavan Googlelta ohjelmia, jotka parantavat niiden esteettömyyttä?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ei kuvausta."</string>
     <string name="settings_button" msgid="3006713718908152930">"Asetukset"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akku"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Ladataan"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ruutu käytössä"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS käytössä"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wifi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wifi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Käytössä"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobiiliverkon signaali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Laitteen käytössäoloaika"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wifi ajoissa"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wifi ajoissa"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wifi-yhteyden käytössäoloaika"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wifi-yhteyden käytössäoloaika"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historiatiedot"</string>
     <string name="details_title" msgid="3792801565213935385">"Käyttötiedot"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Säädä virrankäyttöä"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Sisältyvät paketit"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ruutu"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wifi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Kennot virransäästötilassa"</string>
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Suorittimen käyttö etualalla"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ei virransäästötilaa"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wifi käytössä"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifi on käytössä"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Puhelin"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Tiedot lähetetty"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Sovelluksen tiedot"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Sovellusasetukset"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ruudun asetukset"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wifi-asetukset"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wifi-asetukset"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-asetukset"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Äänipuhelujen käyttämä akku"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Käytetty akun virta tablet-laitteen ollessa pois käytöstä"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Vaihda lentokonetilaan säästääksesi akkua ollessasi katvealueella."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Näytön ja taustavalon käyttämä akku"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Vähennä näytön kirkkautta ja/tai näytön sammumista"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wifi-yhteyden käyttämä akku"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Poista wifi käytöstä, kun sitä ei käytetä tai kun yhteys ei ole käytettävissä."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wifi-yhteyden käyttämä akku"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Poista wifi käytöstä, kun sitä ei käytetä tai kun yhteys ei ole käytettävissä"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth-yhteyden käyttämä akun virta"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Poista Bluetooth-yhteys käytöstä, kun et käytä sitä."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Yritä yhdistää eri Bluetooth-laitteeseen."</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Määritä"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Valitse toinen moottori"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Tämä puhesynteesimoottori saattaa kerätä kaiken puhutun tekstin, mukaan lukien henkilökohtaiset tiedot kuten salasanat ja luottokorttinumerot. Se on lähtöisin moottorista <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Haluatko ottaa tämän puhesynteesimoottorin käyttöön?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Tämä kieli vaatii verkkoyhteyden, jotta tekstistä puheeksi muuntaminen toimii."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moottorit"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-asetukset"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> on käytössä"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ensisijainen moottori"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Yleiset"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Virranhallinta"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Päivitetään wifi-asetuksia"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Päivitetään wifi-asetuksia"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Päivitetään Bluetooth-asetuksia"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"käytössä"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"pois käytöstä"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"otetaan käyttöön"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"poistetaan käytöstä"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wifi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronointi"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Poista kaikki varmenteet"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Luotetut todennustiedot"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Näytä luotetut CA-varmenteet"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tallennustilan tyyppi"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Laitteiston tukema"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Vain ohjelmisto"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Piirrä lukituksenpoistokuvio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Varmuuskopiointi &amp; palautus"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Henkilötiedot"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Varmuuskopioi tiedot"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Varmuuskopioi sovelluksen tiedot, wifi-salasanat ja muut asetukset Googlen palvelimille."</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Varmuuskopioi sovelluksen tiedot, wifi-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="auto_restore_title" msgid="5397528966329126506">"Automaattinen palauttaminen"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Uusi salasana ja vahvistus eivät täsmää"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Varasalasanan asetus epäonnistui"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Haluatko lopettaa wifi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Haluatko lopettaa wifi-salasanojen, kirjanmerkkien, muiden asetuksien ja sovellustietojen varmuuskopioinnin ja poistaa kaikki kopiot Googlen palvelimilta?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Laitteen järjestelmänvalvoja-asetukset"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Laitteen järjestelmänvalvoja"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Poista käytöstä"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Ilmoitukset"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Soittoääni ja värinä"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Järjestelmä"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wifi-asetukset"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Yhdistä wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Yhdistetään wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wifi-asetukset"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Yhdistä wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Yhdistetään wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Lisää verkko"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ei yhdistetty"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Lisää verkko"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Yhdistetään…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Siirry seuraavaan vaiheeseen"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP ei ole tuettu."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Voit määrittää yhteyden asennuksen jälkeen kohdassa Asetukset &gt; Langaton verkko ja verkot."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Et voi määrittää EAP wifi -yhteyttä asennuksen aikana. Voit määrittää yhteyden asennuksen jälkeen kohdassa Asetukset &gt; Langaton verkko ja verkot."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Yhteyden muodostaminen voi kestää muutaman minuutin..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>"."\n\n"Muodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>"."\n\n"Muodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronointi käytössä"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronointi pois käytöstä"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkronointivirhe."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Sovellus odottaa vianetsinnän lisäämistä, ja käynnistyy sen jälkeen."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Syöte"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Piirustus"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Laitteistokiihdytetty hahmonnus"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Valvonta"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Tiukka tila käytössä"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Vilkuta näyttöä sovellusten tehdessä pitkiä toimia"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Paras -&gt; huonoin: sin., vihr., vaal.pun., pun."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Ota jäljitys käyttöön"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Valitse käytettävät jälj."</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Jäljityksiä ei käytössä"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jäljitystä tällä hetkellä käytössä"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kaikki jäljitykset käytössä"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ota OpenGL-jälj. käyttöön"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Näytä asettelun rajat"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Näytä leikkeiden rajat, marginaalit jne."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Käytä GPU:ta 2d-piirtämiseen"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Pakota 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Ota käyttöön 4x MSAA OpenGL ES 2.0 -sovelluksissa"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Korjaa ei-suorakulmaisten leiketoimintojen virheet"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profiilin GPU-hahmonnus"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mittaa hahmonnusaika: adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ikkunan animaat. mittak."</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Taustapros. enintään"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Näytä kaikki ANR:t"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Näytä Sovellus ei vastaa -ikkuna taustasovell."</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Käytä kokeell. WebView\'ta"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Sovellukset käyttävät uusinta (beta) WebView\'ta"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Tietojen käyttö"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Tiedonsiirtojakso"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Verkkoyhteys roaming-tilassa"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Taustatiedonsiirr. rajoittaminen"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Erittele 4G-tiedonsiirto"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Näytä wifi-tiedonsiirto"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Näytä wifi-tiedonsiirto"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Näytä Ethernet-käyttö"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobiiliyhteyden hotspotit"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Tietojen automaattinen synkronointi"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Aseta mobiilitiedonsiirtoraja"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Aseta 4G-tiedonsiirtoraja"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Aseta 2G-3G-tiedonsiirtoraja"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Aseta wifi-tiedonsiirtoraja"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wifi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Aseta wifi-tiedons.raja"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wifi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiili"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Tablet-laite mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiiliyhteytesi poistetaan käytöstä, jos määritetty tiedonsiirtoraja saavutetaan."\n\n"Puhelin mittaa tiedonsiirron. Operaattorisi voi kuitenkin käyttää eri mittaustapaa, joten suosittelemme määrittämään rajan todellista käyttöä tiukemmaksi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Rajoitetaanko taustatiedonsiirtoa?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellei wifi-verkko ole käytettävissä."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jos rajoitat taustalla tapahtuvaa mobiilitiedonsiirtoa, jotkin sovellukset ja palvelut eivät toimi, ellet ole yhteydessä wifi-verkkoon."\n\n"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varoitus"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"rajoitus"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Poistetut sovellukset"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty tablet-laitteen mukaan. Operaattorin mittaustulos voi erota tästä."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: n. <xliff:g id="TOTAL">%1$s</xliff:g> käytetty puhelimen mukaan. Operaattorin mittaustulos voi erota tästä."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiiliyhteyden hotspotit"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Valitse wifi-verkot, joita käytetään mobiiliyhteyden hotspotteina. Sovelluksia voidaan kieltää käyttämästä näitä verkkoja niiden toimiessa taustalla. Sovellukset voivat myös näyttää varoituksen ennen suurien tiedostojen lataamista näiden verkkojen kautta."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Valitse wifi-verkot, joita käytetään mobiiliyhteyden hotspotteina. Sovelluksia voidaan kieltää käyttämästä näitä verkkoja niiden toimiessa taustalla. Sovellukset voivat myös näyttää varoituksen ennen suurien tiedostojen lataamista näiden verkkojen kautta."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiiliverkot"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wifi-verkot"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ota wifi käyttöön valitaksesi mobiiliyhteyden hotspotteja."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wifi-verkot"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Ota wifi käyttöön valitaksesi mobiiliyhteyden hotspotteja."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hätäpuhelu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Palaa puheluun"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nimi"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Salliva"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Täytäntöönpano"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Käyttäjät"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Sinä"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Muut käyttäjät"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Lisää käyttäjä"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiivinen"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Ei aktiivinen"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Käyttäjät ja profiilit"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Lisää käyttäjä tai profiili"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Rajoitettu profiili"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ennen kuin voit luoda rajoitetun profiilin, määritä ruudun lukitus, joka suojelee sovelluksiasi ja henkilökohtaisia tietojasi."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Aseta lukitus"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ei määritetty"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Asetuksia ei ole määritetty – rajoitettu profiili"</string>
     <string name="user_owner" msgid="3879126011135546571">"Omistaja"</string>
+    <string name="user_you" msgid="1639158809315025986">"Sinä (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Lempinimi"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Lisää"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Tavallisilla käyttäjillä on omia sovelluksia ja sisältöä."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Voit rajoittaa tilisi sovelluksien ja sisällön käyttöä"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Käyttäjä"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Rajoitettu profiili"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lisää uusi käyttäjä"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Voit jakaa tämän laitteen muiden kanssa luomalla uusia käyttäjiä. Jokaisella käyttäjällä on oma tila, johon he voivat lisätä omia sovelluksiaan, taustakuvan ynnä muuta. Käyttäjät voivat myös muokata kaikkiin käyttäjiin vaikuttavia tablet-laitteen asetuksia, kuten wifi-yhteysasetuksia."\n\n"Kun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa."\n\n"Kaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Voit jakaa tämän laitteen muiden kanssa luomalla uusia käyttäjiä. Jokaisella käyttäjällä on oma tila, johon he voivat lisätä omia sovelluksiaan, taustakuvan ynnä muuta. Käyttäjät voivat myös muokata kaikkiin käyttäjiin vaikuttavia tablet-laitteen asetuksia, kuten wifi-yhteysasetuksia."\n\n"Kun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa."\n\n"Kaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Kun luot uuden käyttäjän, hänen täytyy määrittää omat asetuksensa."\n\n"Kaikki käyttäjät voivat hyväksyä päivitettyjä sovelluksien lupia muiden käyttäjien puolesta."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Määritetäänkö käyttäjän asetukset nyt?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Varmista, että tämä henkilö voi ottaa tablet-laitteen käyttöönsä, ja määritä hänen tilansa asetukset"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Määritetäänkö profiilin asetukset nyt?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Määritä nyt"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ei nyt"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Vain tablet-laitteen omistaja voi hallita käyttäjiä."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Vain puhelimen omistaja voi hallita käyttäjiä."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Rajoitetut profiilit eivät voi lisätä tilejä"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Poista <xliff:g id="USER_NAME">%1$s</xliff:g> laitteesta"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Uusi käyttäjä"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Uusi profiili"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Haluatko poistaa itsesi?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Poistetaanko käyttäjä?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Poistetaanko profiili?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Tilasi ja tietosi poistetaan tästä tablet-laitteesta. Tätä toimintoa ei voi peruuttaa."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Tilasi ja tietosi poistetaan tästä puhelimesta. Tätä toimintoa ei voi peruuttaa."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Tämän käyttäjän tila ja tiedot poistetaan tästä tablet-laitteesta. Toimintoa ei voi peruuttaa."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Tämän käyttäjän tila ja tiedot poistetaan tästä puhelimesta. Toimintoa ei voi peruuttaa."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Tämän profiilin tila ja tiedot poistetaan tästä tablet-laitteesta. Toimintoa ei voi peruuttaa."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Tämän profiilin tila ja tiedot poistetaan tästä puhelimesta. Toimintoa ei voi peruuttaa."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Lisätään uutta käyttäjää..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Poista käyttäjä"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Poista"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tämä asetus vaikuttaa kaikkiin tämän tablet-laitteen käyttäjiin."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tämä asetus vaikuttaa kaikkiin tämän puhelimen käyttäjiin."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Vaihda kieltä"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Kuvatunnus"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcast -lähetykset"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valitse näytettävät hätäilmoitukset."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Sovelluksien ja sisällön rajoituks."</string>
+    <string name="user_rename" msgid="8523499513614655279">"NIMEÄ UUDELLEEN"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Aseta sovelluksen rajoitukset"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wifi- ja mobiiliverkko"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Salli wifi- ja mobiiliverkkoasetuksien muokkaaminen"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Salli Bluetooth-parien ja -asetuksien muokkaaminen"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Salli tiedonsiirto, kun tablet-laite koskettaa toista laitetta"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Salli tiedonsiirto, kun puhelin koskettaa toista laitetta"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Sijainnin käyttöoikeus"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Anna sovellusten käyttää sijaintitietojasi"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Edellinen"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Seuraava"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Valmis"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Ota kuva"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Valitse kuva galleriasta"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 0e963b3..b044807 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lente"</item>
     <item msgid="1145554631248513562">"Normale"</item>
     <item msgid="7553665153391107454">"Rapide"</item>
-    <item msgid="2538100882620724753">"Très rapide"</item>
+    <item msgid="1370673569131070146">"Plus rapide"</item>
+    <item msgid="4648206845228970803">"Très rapide"</item>
+    <item msgid="4977949754169483251">"Rapide"</item>
+    <item msgid="6106302964845503577">"Très rapide"</item>
+    <item msgid="6800277205640837264">"Le plus rapide"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Très grave"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Aucun"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Aucun"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Non spécifié"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Aucun"</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">"Mémoire interne du mobile"</item>
     <item msgid="3738430123799803530">"Carte SD amovible"</item>
     <item msgid="4498124044785815005">"Laisser le système décider"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Position"</item>
+    <item msgid="255608127647030286">"Personnel"</item>
+    <item msgid="4588829735729884491">"SMS/MMS"</item>
+    <item msgid="8971765125227378270">"Appareil"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"position approximative"</item>
+    <item msgid="5789673140227507995">"position précise"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibreur"</item>
+    <item msgid="3434165993711230924">"accéder aux contacts"</item>
+    <item msgid="616161687718081936">"modifier les contacts"</item>
+    <item msgid="7638002295329050091">"lire le journal d\'appels"</item>
+    <item msgid="6546959730920410907">"modifier le journal d\'appels"</item>
+    <item msgid="446877710771379667">"accéder à l\'agenda"</item>
+    <item msgid="7674458294386319722">"modifier l\'agenda"</item>
+    <item msgid="8281201165558093009">"détection du Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notification"</item>
+    <item msgid="7776439107987345446">"détection du réseau mobile"</item>
+    <item msgid="514615766544675057">"appeler"</item>
+    <item msgid="8181415497109310680">"lire les SMS"</item>
+    <item msgid="6816551144382117307">"écrire des SMS"</item>
+    <item msgid="4600463921908905030">"recevoir des SMS"</item>
+    <item msgid="5958926493289432745">"recevoir des SMS d\'urgence"</item>
+    <item msgid="4945269495221089540">"recevoir des MMS"</item>
+    <item msgid="5570472453573929087">"recevoir des messages push WAP"</item>
+    <item msgid="7125408150230860501">"envoyer des SMS"</item>
+    <item msgid="7080337936612188061">"lire les SMS ICC"</item>
+    <item msgid="587124103118495063">"écrire des SMS ICC"</item>
+    <item msgid="2320577158869025503">"modifier les paramètres"</item>
+    <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="5031552983987798163">"lire le fichier audio"</item>
+    <item msgid="8374996688066472414">"lire le Presse-papiers"</item>
+    <item msgid="3045529469061083747">"modifier le Presse-papiers"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Position"</item>
+    <item msgid="8677040780775113033">"Position"</item>
+    <item msgid="1660743989948992916">"Position"</item>
+    <item msgid="8791172739860195290">"Vibreur"</item>
+    <item msgid="383413555642128046">"Accéder aux contacts"</item>
+    <item msgid="3654594895269697313">"Modifier les contacts"</item>
+    <item msgid="7928393476362362538">"Lire le journal d\'appels"</item>
+    <item msgid="6248591205254641116">"Modifier le journal d\'appels"</item>
+    <item msgid="6093344633066170692">"Accéder à l\'agenda"</item>
+    <item msgid="1334886368750347692">"Modifier l\'agenda"</item>
+    <item msgid="1638204101698708656">"Position"</item>
+    <item msgid="2154671955760380322">"Publier des notifications"</item>
+    <item msgid="4282477730595931828">"Position"</item>
+    <item msgid="4891423912898525905">"Appeler"</item>
+    <item msgid="626463821668200388">"Recevoir des SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Envoyer des SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Recevoir des SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Recevoir des SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Recevoir des SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Recevoir des SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Envoyer des SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Recevoir des SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Envoyer des SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifier les paramètres"</item>
+    <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="3493046322001257041">"Lire le fichier audio"</item>
+    <item msgid="136815868796597058">"Lire le Presse-papiers"</item>
+    <item msgid="5238692940326972503">"Modifier le Presse-papiers"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Court"</item>
     <item msgid="2560532955514699713">"Moyen"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (graphismes)"</item>
     <item msgid="1340692776955662664">"Appeler une pile sur glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Désactivé"</item>
+    <item msgid="675719912558941285">"Dessiner zone de découpage non rectangulaire en bleu"</item>
+    <item msgid="1064373276095698656">"Surligner en vert les commandes de dessin testées"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Désactivé"</item>
+    <item msgid="2751513398307949636">"À l\'écran sous forme de barres"</item>
+    <item msgid="8272260411216018353">"À l\'écran sous forme de lignes"</item>
+    <item msgid="120512413928262547">"Dans adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Aucun processus en arrière-plan"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index f2ee1b1..5d0d065 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Mode Avion"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Plus..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Configurer le Wi-Fi, le mode Bluetooth, le mode Avion, les réseaux mobiles et le VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Se connecter aux services de données lors de l\'itinérance"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Se connecter aux services de données lors de l\'itinérance"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Afficher infos utilisateur sur écran verrouillage"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Infos utilisateur"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afficher infos de profil sur écran de verrouillage"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Données de localisation"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Gestion de l\'appareil"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administrateurs de l\'appareil"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afficher ou désactiver les administrateurs de l\'appareil"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer le Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Affichage sans fil"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Pour voir les appareils, activez l\'affichage sans fil."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"L\'affichage sans fil est désactivé, car la connexion Wi-Fi est inactive."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"L\'affichage sans fil est désactivé, car le Wi-Fi n\'est pas activé."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Rechercher affichages"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Recherche en cours…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Aucun affichage sans fil trouvé à prox."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages de navigateur, des vidéos YouTube, des contacts et plus encore."\n\n"Il vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis d\'appuyer sur votre écran. L\'application détermine le contenu à transférer."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Identification du service réseau"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Autoriser les applications sur d\'autres appareils à identifier les applications sur celui-ci"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activer le Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Paramètres Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activer le Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Paramètres Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurer et gérer les points d\'accès sans fil"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Sélectionner le Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Activation du Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Désactivation du Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Sélectionner le Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Activation du Wi-Fi en cours…"</string>
+    <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="3038290727701553612">"Me notifier lorsqu\'un réseau ouvert est disponible"</string>
-    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions de mauvaise qualité"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi actif en veille"</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_scan_always_available" msgid="3470564139944368030">"Recherche toujours disponible"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pour améliorer la précision et à d\'autres fins, le service de localisation de Google et d\'autres applications peuvent rechercher des réseaux Wi-Fi à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Options avancées &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Les applications peuvent rechercher des réseaux à proximité, même lorsque le Wi-Fi est désactivé. Vous pouvez modifier ce paramètre dans Avancé &gt; Recherche toujours disponible."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne plus afficher"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi actif en veille"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Un problème est survenu lors de la modification des paramètres."</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimisation Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimisation du Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiser la consommation de la batterie lorsque le Wi-Fi est activé"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ajouter un réseau"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Réseaux Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Réseaux Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Bouton commande WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Autres options"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Saisie code PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Recherche de réseaux Wi-Fi en cours…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Recherche de réseaux Wi-Fi en cours…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Vous n\'avez pas l\'autorisation de modifier le réseau Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Autre réseau…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Plus"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuration auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pour terminer la configuration de votre tablette, vous devez disposer d\'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d\'utiliser un forfait de données pour mobile ou un réseau Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Pour terminer la configuration de votre tablette, vous devez disposer d\'un accès Wi-Fi. Une fois la configuration effectuée, vous pouvez choisir d\'utiliser un réseau de données mobiles ou le Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afficher les options avancées"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuration Wi-Fi protégée"</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="7204827509934892103">"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="8067502591043979939">"Saisissez le code <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_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_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="5754399645462924103">"Connecté au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Connecté au réseau Wi-Fi \"<xliff:g id="NETWORK_NAME">%s</xliff:g>\""</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"La configuration WPS est déjà en cours et peut prendre jusqu\'à deux minutes."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Échec de la configuration WPS. Veuillez réessayer dans quelques minutes."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuration de sécurité du routeur sans fil (WEP) n\'est pas compatible."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Échec de l\'authentification. Veuillez réessayer."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Une autre session WPS a été détectée. Veuillez réessayer dans quelques minutes."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID du réseau"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Saisissez le SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sécurité"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensité du signal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"État"</string>
@@ -591,16 +610,19 @@
     <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_remembered" msgid="4955746899347821096">"Enregistré"</string>
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivé"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Mauvaise connexion Internet évitée"</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_wps_available_first_item" msgid="4422547079984583502">"WPS disponible"</string>
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
-    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
-    <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>."</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Donner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Refuser"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Se connecter"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Échec de la connexion au réseau."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Retirer"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Ne pas ignorer"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISSEMENT : Des frais supplémentaires de connexion à Internet peuvent être appliqués par votre opérateur."\n\n"La configuration de la tablette peut générer une forte activité sur le réseau."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISSEMENT : Des frais supplémentaires de connexion à Internet peuvent être appliqués par votre opérateur."\n\n"La configuration du téléphone peut générer une forte activité sur le réseau."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVERTISSEMENT : La tablette ne sera pas en mesure de vérifier que votre logiciel est à jour."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVERTISSEMENT : Le téléphone ne sera pas en mesure de vérifier que votre logiciel est à jour."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Connexion impossible de la tablette à ce réseau Wi-Fi gratuit."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Connexion impossible du téléphone à ce réseau Wi-Fi gratuit."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Paramètres Wi-Fi avancés"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Plage de fréquences Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVERTISSEMENT : Vous ne pourrez vérifier que vos logiciels sont à jour sur votre tablette que lorsque vous disposerez d\'une connexion à Internet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVERTISSEMENT : Vous ne pourrez vérifier que vos logiciels sont à jour sur votre téléphone que lorsque vous disposerez d\'une connexion à Internet."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Connexion impossible de la tablette à ce réseau Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Connexion impossible du téléphone à ce réseau Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Paramètres Wi-Fi avancés"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Plage de fréquences Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Définir la plage de fréquences"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Erreur de paramétrage de la plage de fréquences"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresse MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Longueur du préfixe réseau"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informations sur l\'appareil"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Mémoriser cette connexion"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Rechercher des appareils"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation ?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g> ?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Voulez-vous vraiment supprimer ce groupe ?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Point d\'accès Wi-Fi mobile"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurer le point d\'accès Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"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_failed_subtext" msgid="1484941858530919002">"Erreur liée au point d\'accès Wi-Fi mobile."</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurer le point d\'accès Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensité du signal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Itinérance"</string>
     <string name="status_operator" msgid="2274875196954742087">"Réseau"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresse MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresse MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresse Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numéro de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponible"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activé"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN désactivé"</string>
     <string name="bearer" msgid="594270280031923558">"Réseau"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Type MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valeur MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Supprimer l\'APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nouvel APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Enregistrer"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Aide"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Réseaux mobiles"</string>
     <string name="location_title" msgid="1029961368397484576">"Ma position"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Localis. via Wi-Fi et réseau mobile"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseaux mobiles"</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="7457348712272184793">"Position déterminée par le Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satellites GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Autoriser les applications à utiliser le GPS sur votre tablette pour vous localiser"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Autoriser les applications à utiliser le GPS sur votre téléphone pour vous localiser"</string>
@@ -967,7 +991,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Localisation et recherche"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Autoriser Google à utiliser votre position pour améliorer vos résultats de recherche et autres services Google"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Accès à ma position"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permettre aux applications ayant demandé votre autorisation d\'utiliser vos informations de localisation"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permettre aux applis ayant demandé l\'autorisation d\'utiliser vos infos de localisation"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Sources de localisation"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"À propos de la tablette"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"À propos du téléphone"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtrer"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Sélectionner les options du filtre"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toutes"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Désactivées"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Téléchargées"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"En cours"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stockage USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Si vous désactivez une application intégrée, d\'autres applications peuvent avoir un comportement défaillant. Vos données seront également supprimées."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Désactiver les notifications ?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Si vous désactivez les notifications de cette application, vous risquez de manquer des alertes et des mises à jour importantes."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Fonctionnement des applications"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"En cours d\'exécution"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Jamais utilisé)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisation du stockage"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afficher l\'espace de stockage utilisé par les applications"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Mot :"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Raccourci :"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Langue :"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Saisissez un mot"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Raccourci facultatif"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifier le mot"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifier"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Supprimer"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Paramètres du clavier physique"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</string>
     <string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode débogage lorsqu\'un câble USB est connecté"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Annuler les autorisations relatives au débogage USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Rapports de bug du menu de démarrage"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclure une option permettant d\'établir un rapport de bug dans le menu de démarrage"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Rester activé"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Activer les paramètres de développement ?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ces paramètres sont en cours de développement. Ils peuvent endommager votre appareil et les applications qui s\'y trouvent, ou provoquer leur dysfonctionnement."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Vérifier les applis via USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Marche/arrêt pour raccrocher"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Énoncer les mots de passe"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Délai de pression"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Améliorer l\'accessibilité Web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Paramètres"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activé"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Désactivé"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Autorisé"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Non autorisé"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Autoriser"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Ne pas autoriser"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Utiliser <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> peut recueillir la totalité du texte que vous saisissez, à l\'exception des mots de passe. Ceci comprend les données personnelles, telles que le numéro de votre carte de paiement, mais également les données sur vos interactions avec la tablette."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> peut recueillir la totalité du texte que vous saisissez, à l\'exception des mots de passe. Ceci comprend les données personnelles, telles que le numéro de votre carte de paiement, mais également les données sur vos interactions avec le téléphone."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Si vous appuyez sur \"OK\", <xliff:g id="SERVICE">%1$s</xliff:g> sera arrêté."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observer vos actions"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Recevoir des notifications lorsque vous interagissez avec une application."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Si vous appuyez sur \"OK\", cela interrompt <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vous avez besoin d\'un lecteur d\'écran ?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fournit des commentaires audio aux personnes malvoyantes. Voulez-vous l\'installer gratuitement depuis l\'Android Market ?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Voulez-vous que les applications installent des scripts de Google pour rendre leur contenu Web plus accessible ?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Aucune description fournie"</string>
     <string name="settings_button" msgid="3006713718908152930">"Paramètres"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Batterie en charge"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Écran activé"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activé"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"En activité"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal du réseau mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi/temps"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi/temps"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Informations sur l\'historique"</string>
     <string name="details_title" msgid="3792801565213935385">"Informations sur l\'utilisation"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Ajuster la consommation"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Modules inclus"</string>
     <string name="power_screen" msgid="3023346080675904613">"Écran"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Veille GSM"</string>
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"UC - Premier plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Maintenir activé"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi actif"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi actif"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablette"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Téléphone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Données envoyées"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informations sur l\'application"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Paramètres de l\'application"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Paramètres de l\'écran"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Paramètres Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Paramètres Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Paramètres Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batterie utilisée par les appels vocaux"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batterie utilisée lorsque la tablette est inactive"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Passez en mode Avion pour économiser la batterie dans les zones sans couverture cellulaire."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batterie utilisée par l\'affichage et le rétro-éclairage"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Réduire la luminosité et/ou le délai de mise en veille de l\'écran"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batterie utilisée par le Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Désactivez le Wi-Fi lorsque vous ne l\'utilisez pas ou qu\'il n\'est pas disponible."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batterie utilisée par le Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Désactivez le Wi-Fi lorsque vous ne l\'utilisez pas ou qu\'il n\'est pas disponible."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batterie utilisée par Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Désactivez Bluetooth lorsque vous ne l\'utilisez pas."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Essayez de vous connecter à un autre appareil Bluetooth."</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Sélectionner un autre moteur"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ce moteur de synthèse vocale est susceptible de collecter tout ce qui sera lu, y compris les données personnelles comme les mots de passe et les numéros de carte de paiement. Il provient du moteur <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Voulez-vous activer son utilisation ?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Une connexion réseau est nécessaire pour la synthèse vocale dans cette langue."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moteurs"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Paramètres <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> est activé."</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Moteur préféré"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Paramètres généraux"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Contrôle de l\'alimentation"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Mise à jour des paramètres Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mise à jour des paramètres Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mise à jour des paramètres Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activé"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"désactivé"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"activation"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"désactivation"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronisation"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Type de stockage"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sauvegarde et restauration"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Données personnelles"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sauvegarder mes données"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"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_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="auto_restore_title" msgid="5397528966329126506">"Restaurer automatiquement"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Le nouveau mot de passe et sa confirmation ne correspondent pas."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Échec de la définition du mot de passe de secours."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris, ainsi que d\'autres paramètres et données d\'applications, et en effacer toutes les copies des serveurs Google ?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Voulez-vous vraiment arrêter de sauvegarder vos mots de passe Wi-Fi, vos favoris, ainsi que d\'autres paramètres et données d\'applications, et en effacer toutes les copies des serveurs Google ?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Paramètres de gestion de l\'appareil"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrateur de l\'appareil"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Désactiver"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifications"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Sonnerie et vibreur pour les appels"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Système"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configuration Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Se connecter au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Connexion au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connecté au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configuration Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Se connecter au réseau Wi-Fi \"<xliff:g id="NETWORK_NAME">%s</xliff:g>\""</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Connexion au réseau Wi-Fi \"<xliff:g id="NETWORK_NAME">%s</xliff:g>\" en cours…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Connecté au réseau Wi-Fi \"<xliff:g id="NETWORK_NAME">%s</xliff:g>\""</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Ajouter un réseau"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Non connecté"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ajouter un réseau"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Connexion en cours…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Passer à l\'étape suivante"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"L\'EAP n\'est pas compatible."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Vous ne pouvez pas configurer de connexion Wi-Fi EAP lors de l\'installation. Une fois celle-ci effectuée, vous pourrez le faire dans Paramètres &gt; Sans fil et réseaux."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Impossible de paramétrer de connexion Wi-Fi EAP lors de la configuration. Une fois celle-ci effectuée, vous pourrez le faire via Paramètres &gt; Sans fil et réseaux."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connexion peut prendre quelques minutes…"</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration."\n\n"Appuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration."\n\n"Appuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Avant de s\'exécuter, l\'application déboguée doit attendre que le débogueur soit attaché."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Saisie"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Tracé"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Accélération matérielle"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Suivi"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Mode Strict activé"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Afficher un cadre rouge si le thread principal reste occupé"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Du mieux au pire : bleu, vert, rouge clair, rouge"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Activer les traces"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Sélect. traces activées"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Aucune trace n\'est activée actuellement."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traces activées actuellement"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Toutes les traces sont actuellement activées."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Activer les traces OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afficher les contours"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forcer l\'utilisation du GPU pour le dessin 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forcer MSAA 4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Activer MSAA 4x dans les applications OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Déboguer opérations de découpage non rectangulaire"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Rendu GPU du profil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mesurer durée rendu dans adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Échelle animation fenêtres"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processus arr.-plan"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages \"L\'application ne répond pas\""</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher \"L\'application ne répond plus\" pour applis en arrière-plan"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Utiliser WebView expérim."</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Applis utiliseront dernière version WebView (bêta)."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Consommation des données"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cycle de consommation"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Autoriser itinérance"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Limiter données arr.-plan"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilisation 4G séparée"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afficher conso en Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Afficher conso en Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afficher l\'utilisation Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Points d\'accès mobiles"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Synchronisation automatique des données"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Définir un plafond"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Définir le quota de données 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Définir quota de données 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Définir quota de données Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Définir quota données Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiles"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par la tablette, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Votre connexion Internet mobile sera désactivée une fois le seuil défini atteint."\n\n"La consommation des données étant mesurée par le téléphone, celle mesurée par votre opérateur peut différer. Nous vous recommandons donc de définir un seuil plus bas."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limiter les données en arrière-plan ?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Si vous limitez les données mobiles en arrière-plan, certains services et applications ne fonctionneront que si vous êtes connecté à un réseau Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Si vous limitez les données mobiles en arrière-plan, certains services et applications ne fonctionneront que si vous êtes connecté à un réseau Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Si vous limitez les données mobiles en arrière-plan, certaines applications et certains services ne fonctionneront pas correctement, sauf si vous êtes connecté à un réseau Wi-Fi."\n\n"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"alerte"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"plafond"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applications supprimées"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : env. <xliff:g id="TOTAL">%1$s</xliff:g> utilisés,  selon votre tablette. Le suivi conso de votre opérateur peut différer."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : env. <xliff:g id="TOTAL">%1$s</xliff:g> utilisés, selon votre téléphone. Le suivi conso de votre opérateur peut différer."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Points d\'accès mobiles"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Sélectionnez les réseaux Wi-Fi qui sont des points d\'accès mobiles. Il est possible que les applications qui s\'exécutent en arrière-plan ne soient pas autorisées à utiliser ces réseaux. Les applications peuvent également vous avertir avant de les utiliser pour les téléchargements volumineux."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Sélectionnez les réseaux Wi-Fi qui sont des points d\'accès mobiles. Il est possible que les applications qui s\'exécutent en arrière-plan ne soient pas autorisées à utiliser ces réseaux. Vous pouvez également être averti avant qu\'ils ne soient utilisés pour les téléchargements volumineux via les applications."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Réseaux mobiles"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Réseaux Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Pour sélectionner des points d\'accès mobiles, activez le Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Réseaux Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Pour sélectionner des points d\'accès mobiles, activez le Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Appel d\'urgence"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retour à l\'appel"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nom"</string>
@@ -1794,34 +1824,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissif"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Application"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilisateurs"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Vous"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Autres utilisateurs"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Ajouter utilisateur"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Actif"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactif"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Utilisateurs et profils"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Ajouter un utilisateur ou un profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limité"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Avant de créer un profil limité, vous devez définir un écran de verrouillage pour protéger vos applications et vos données personnelles."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Définir verrouillage écran"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configuré"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Non configuré : profil limité"</string>
     <string name="user_owner" msgid="3879126011135546571">"Propriétaire"</string>
+    <string name="user_you" msgid="1639158809315025986">"Vous (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonyme"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Ajouter"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Les utilisateurs disposent de leurs propres applications et de leur propre contenu."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Vous pouvez limiter l\'accès aux applications et au contenu depuis votre compte."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilisateur"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limité"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ajouter un utilisateur"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Vous pouvez partager cet appareil avec d\'autres personnes en créant des utilisateurs supplémentaires. Chaque utilisateur dispose de son propre espace, où il peut personnaliser ses propres applications, ses fonds d\'écran, et autres. Chacun peut également modifier les paramètres d\'une tablette, tels que le Wi-Fi, qui affectent tous les utilisateurs."\n\n"Lorsque vous créez un nouvel utilisateur, celui-ci doit suivre une procédure d\'installation."\n\n"N\'importe quel utilisateur peut accepter des autorisations mises à jour pour les applications au nom de tous les autres."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Vous pouvez partager cet appareil avec d\'autres personnes en créant des utilisateurs. Chaque utilisateur dispose de son propre espace, où il peut personnaliser, entre autres, ses applications et son fond d\'écran. Chacun peut également modifier les paramètres de la tablette, tels que le Wi-Fi, qui affectent tous les utilisateurs."\n\n"Lorsque vous créez un utilisateur, celui-ci doit suivre une procédure de configuration."\n\n"N\'importe quel utilisateur peut accepter, au nom de tous les autres, des autorisations mises à jour relatives aux applications."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Lorsque vous créez un nouvel utilisateur, celui-ci doit suivre une procédure d\'installation."\n\n"N\'importe quel utilisateur peut accepter des autorisations mises à jour pour les applications au nom de tous les autres."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurer l\'utilisateur ?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Assurez-vous que la personne est disponible, et qu\'elle peut utiliser la tablette et configurer son espace."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurer le profil maintenant ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurer maintenant"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Pas maintenant"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Seul le propriétaire du téléphone peut gérer les utilisateurs."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vous supprimer ?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Supprimer l\'utilisateur ?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Supprimer le profil ?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Votre espace et vos données vont être supprimés de cette tablette. Cette action est irréversible."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Votre espace et vos données vont être supprimés de ce téléphone. Cette action est irréversible."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"L\'espace et les données de cet utilisateur vont être supprimés de cette tablette. Cette action est irréversible."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"L\'espace et les données de cet utilisateur vont être supprimés de ce téléphone. Cette action est irréversible."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"L\'espace et les données de ce profil vont être supprimés de cette tablette. Cette action est irréversible."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"L\'espace et les données de ce profil vont être supprimés de ce téléphone. Cette action est irréversible."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Ajout de l\'utilisateur…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Supprimer l\'utilisateur"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Supprimer"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ce paramètre affecte tous les utilisateurs de cette tablette."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ce paramètre affecte tous les utilisateurs de ce téléphone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Modifier la langue"</string>
@@ -1832,4 +1878,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Diffusions cellulaires"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Sélectionnez les types d\'alertes d\'urgence à afficher."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Limitations accès applis et contenu"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENOMMER"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Définir restrictions des applications"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Autoriser les modifications des associations et des paramètres Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Autoriser l\'échange de données lorsque la tablette est en contact avec un autre appareil"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Autoriser l\'échange de données lorsque le téléphone est en contact avec un autre appareil"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Accès aux données de localisation"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Autoriser les applications à utiliser vos données de localisation"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Retour"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Suivant"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Terminer"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index c6c7aab..6ae78a9 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"धीमा"</item>
     <item msgid="1145554631248513562">"सामान्य"</item>
     <item msgid="7553665153391107454">"तेज़"</item>
-    <item msgid="2538100882620724753">"अत्‍यधिक तेज़"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"कुछ नहीं"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"कोई नहीं"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"अनिर्दिष्ट"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"कोई नहीं"</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">"आंतरिक उपकरण संग्रहण"</item>
     <item msgid="3738430123799803530">"निकाले जाने योग्‍य SD कार्ड"</item>
     <item msgid="4498124044785815005">"सिस्‍टम को निर्धारित करने दें"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"स्थान"</item>
+    <item msgid="255608127647030286">"व्यक्तिगत"</item>
+    <item msgid="4588829735729884491">"संदेश सेवा"</item>
+    <item msgid="8971765125227378270">"उपकरण"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"अस्पष्ट स्थान"</item>
+    <item msgid="5789673140227507995">"सटीक स्थान"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"कंपन"</item>
+    <item msgid="3434165993711230924">"संपर्क पढ़ें"</item>
+    <item msgid="616161687718081936">"संपर्कों को बदलें"</item>
+    <item msgid="7638002295329050091">"कॉल लॉग पढ़ें"</item>
+    <item msgid="6546959730920410907">"कॉल लॉग बदलें"</item>
+    <item msgid="446877710771379667">"कैलेंडर पढ़ें"</item>
+    <item msgid="7674458294386319722">"कैलेंडर बदलें"</item>
+    <item msgid="8281201165558093009">"wi-fi स्कैन"</item>
+    <item msgid="8694611243479480497">"सूचना"</item>
+    <item msgid="7776439107987345446">"सेल स्कैन"</item>
+    <item msgid="514615766544675057">"फ़ोन पर कॉल करें"</item>
+    <item msgid="8181415497109310680">"SMS पढ़ें"</item>
+    <item msgid="6816551144382117307">"SMS लिखें"</item>
+    <item msgid="4600463921908905030">"SMS प्राप्त करें"</item>
+    <item msgid="5958926493289432745">"आपातकालीन SMS प्राप्त करें"</item>
+    <item msgid="4945269495221089540">"MMS प्राप्त करें"</item>
+    <item msgid="5570472453573929087">"WAP पुश प्राप्त करें"</item>
+    <item msgid="7125408150230860501">"SMS भेजें"</item>
+    <item msgid="7080337936612188061">"ICC SMS पढ़ें"</item>
+    <item msgid="587124103118495063">"ICC SMS लिखें"</item>
+    <item msgid="2320577158869025503">"सेटिंग बदलें"</item>
+    <item msgid="1545733463471924009">"ऊपर बनाएं"</item>
+    <item msgid="3609046903962454582">"सूचनाओं को एक्सेस करें"</item>
+    <item msgid="4671646036128214513">"कैमरा"</item>
+    <item msgid="1097324338692486211">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="5031552983987798163">"ऑडियो चलाएं"</item>
+    <item msgid="8374996688066472414">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="3045529469061083747">"क्लिपबोर्ड बदलें"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"स्थान"</item>
+    <item msgid="8677040780775113033">"स्थान"</item>
+    <item msgid="1660743989948992916">"स्थान"</item>
+    <item msgid="8791172739860195290">"कंपन"</item>
+    <item msgid="383413555642128046">"संपर्क पढ़ें"</item>
+    <item msgid="3654594895269697313">"संपर्कों को बदलें"</item>
+    <item msgid="7928393476362362538">"कॉल लॉग पढ़ें"</item>
+    <item msgid="6248591205254641116">"कॉल लॉग बदलें"</item>
+    <item msgid="6093344633066170692">"कैलेंडर पढ़ें"</item>
+    <item msgid="1334886368750347692">"कैलेंडर बदलें"</item>
+    <item msgid="1638204101698708656">"स्थान"</item>
+    <item msgid="2154671955760380322">"सूचना पोस्ट करें"</item>
+    <item msgid="4282477730595931828">"स्थान"</item>
+    <item msgid="4891423912898525905">"फ़ोन पर कॉल करें"</item>
+    <item msgid="626463821668200388">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="1237538540368797101">"SMS/MMS भेजें"</item>
+    <item msgid="3986142739951490025">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="3984213795861739778">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="3656243523752472788">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="8105802370238551510">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="1407766984645388488">"SMS/MMS भेजें"</item>
+    <item msgid="1530132603376027248">"SMS/MMS प्राप्त करें"</item>
+    <item msgid="1188256962149204607">"SMS/MMS भेजें"</item>
+    <item msgid="4218544235221631789">"सेटिंग बदलें"</item>
+    <item msgid="736541391767350377">"ऊपर बनाएं"</item>
+    <item msgid="5530815681721654194">"सूचनाओं को एक्सेस करें"</item>
+    <item msgid="781213371706962767">"कैमरा"</item>
+    <item msgid="1720492593061838172">"ऑडियो रिकॉर्ड करें"</item>
+    <item msgid="3493046322001257041">"ऑडियो चलाएं"</item>
+    <item msgid="136815868796597058">"क्लिपबोर्ड पढ़ें"</item>
+    <item msgid="5238692940326972503">"क्लिपबोर्ड बदलें"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"कम"</item>
     <item msgid="2560532955514699713">"मध्यम"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (ग्राफ़िक)"</item>
     <item msgid="1340692776955662664">"glGetError पर स्टैक कॉल करें"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"बार के रूप में स्‍क्रीन पर"</item>
+    <item msgid="8272260411216018353">"रेखाओं के रूप में स्‍क्रीन पर"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo में"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"मानक सीमा"</item>
     <item msgid="4071574792028999443">"कोई पृष्ठभूमि प्रक्रियाएं नहीं"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e2eb5e9..0db9d73 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"हवाई जहाज मोड"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"अधिक…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"वायरलेस और नेटवर्क"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, हवाई जहाज मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, हवाई जहाज़ मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"रोमिंग के समय डेटा सेवाएं कनेक्ट करें"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"लॉक स्‍क्रीन पर प्रदर्शित करने के लिए पाठ लिखें"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"लॉक स्क्रीन पर उपयोगकर्ता जानकारी दिखाएं"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"उपयोगकर्ता जानकारी"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"स्थान पहुंच"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"सुरक्षा"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेंशियल संग्रहण लॉक सेट करें"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"उपकरण व्‍यवस्‍थापक"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"उपकरण व्‍यवस्‍थापक"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"उपकरण व्‍यवस्‍थापकों को देखें या निष्‍क्रिय करें"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"सूचना की एक्सेस"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth चालू करें"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"सेटिंग याद रखें"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"वायरलेस प्रदर्शन"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"उपकरणों को देखने के लिए, वायरलेस प्रदर्शन चालू करें."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"वायरलेस प्रदर्शन अक्षम है क्योंकि Wi-Fi बंद है."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"वायरलेस प्रदर्शन अक्षम है क्योंकि Wi-Fi बंद है."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"प्रदर्शनों के लिए खोजें"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"खोज रहा है…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"आस-पास कोई भी वायरलेस प्रदर्शन नहीं मिले."</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi चालू करें"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi सेटिंग"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi चालू करें"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi‑Fi सेटिंग"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wi-Fi को चुनें"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi चालू हो रहा है.."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi बंद कर रहा है…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi चुनें"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi चालू हो रहा है…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi बंद हो रहा है…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"त्रुटि"</string>
     <string name="wifi_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="3038290727701553612">"खुला नेटवर्क उपलब्‍ध होने पर मुझे सूचित करें"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"जब तक अच्छा इंटरनेट कनेक्‍शन न हो, तब तक Wi-Fi नेटवर्क का उपयोग न करें"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"निष्क्रिय होने के दौरान Wi-Fi चालू रखें"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"जब तक Wi-Fi नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"स्कैनिंग हमेशा उपलब्ध है"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Google की स्थान सेवा और अन्य एप्लिकेशन को नेटवर्क खोजने दें,  Wi-Fi बंद होने पर भी"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"प्रमाणपत्र इंस्टाल करें"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"स्थान सटीकता को बेहतर बनाने तथा अन्य प्रयोजनों के लिए, Google और अन्य एप्लिकेशन आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"एप्लिकेशन आसपास के नेटवर्क स्कैन कर सकते हैं, भले ही Wi-Fi बंद हो. यदि आप ऐसा नहीं होने देना चाहते हैं, तो उन्नत &gt; स्कैनिंग हमेशा उपलब्ध पर जाएं."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"फिर से न दिखाएं"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"निष्क्रिय रहने के दौरान Wi-Fi चालू रखें"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"सेटिंग बदलने में एक समस्‍या थी"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi ऑप्टिमाइज़ेशन"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-Fi के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi ऑप्टिमाइज़ेशन"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi के चालू रहने पर बैटरी उपयोग को न्यूनतम करें"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"नेटवर्क जोड़ें"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi नेटवर्क"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi नेटवर्क"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS पुश बटन"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"अधिक विकल्प"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS पिन प्रविष्टि"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi डायरेक्ट"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi प्रत्यक्ष"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"स्कैन करें"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"उन्नत"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क भूलें"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"उपलब्‍ध नेटवर्क देखने के लिए, Wi-Fi को चालू करें."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fi नेटवर्क खोज रहा है…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"उपलब्‍ध नेटवर्क देखने के लिए, Wi-Fi चालू करें."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi नेटवर्क की खोज जारी है…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"आपको Wi‑Fi नेटवर्क बदलने की अनुमति नहीं है."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"अन्‍य नेटवर्क…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"अधिक"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"स्‍वचालित सेटअप (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"सेटअप पूर्ण करने के लिए, आपके टेबलेट को Wi-Fi का उपयोग करना होगा. सेटअप के बाद, आप मोबाइल डेटा और Wi-Fi के बीच स्विच कर सकते हैं."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"सेटअप पूर्ण करने के लिए, आपके टेबलेट की Wi-Fi पर एक्सेस होनी चाहिए. सेटअप करने के बाद, आप मोबाइल डेटा और Wi-Fi के बीच स्विच कर सकते हैं."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"उन्नत विकल्प दिखाएं"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi सुरक्षित सेटअप"</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="7204827509934892103">"अपने रूटर पर Wi-Fi सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिह्न हो सकता है:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"अपने Wi-Fi राउटर पर पिन <xliff:g id="NUMBER">%1$s</xliff:g> दर्ज करें. सेटअप पूर्ण होने में दो मिनट तक लग सकते हैं."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"अपने राउटर पर 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="5754399645462924103">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट किया गया"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट है"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS पहले से ही चल रहा है और पूर्ण होने में दो मिनट तक लग सकते हैं"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS विफल रहा. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नहीं है"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"प्रमाणीकरण विफल. कृपया पुन: प्रयास करें."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"अन्‍य WPS सत्र का पता चला. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"नेटवर्क SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID डालें"</string>
     <string name="wifi_security" msgid="6603611185592956936">"सुरक्षा"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"सिग्‍नल शक्ति"</string>
     <string name="wifi_status" msgid="4824568012414605414">"स्थिति"</string>
@@ -598,9 +617,12 @@
     <string name="wifi_not_in_range" msgid="1136191511238508967">"रेंज में नहीं"</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_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> से सुरक्षित"</string>
-    <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> से सुरक्षित"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</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_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"अस्वीकार करें"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"कनेक्‍ट करें"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"भूलें"</string>
@@ -610,14 +632,14 @@
     <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="3335132188969450252">"चेतावनी: आपको अतिरिक्त वाहक डेटा शुल्क लग सकते हैं."\n\n"टेबलेट सेटअप के लिए महत्वपूर्ण नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"चेतावनी: आपको अतिरिक्त वाहक डेटा शुल्क लग सकते हैं."\n\n"फ़ोन सेटअप के लिए महत्वपूर्ण नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"चेतावनी: टेबलेट यह सत्यापित नहीं कर सकेगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"चेतावनी: फ़ोन यह सत्यापित नहीं कर सकेगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"टेबलेट इस Wi-Fi नेटवर्क से कनेक्ट नहीं कर सका."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"फ़ोन इस Wi-Fi नेटवर्क से कनेक्ट नहीं कर सका."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"उन्‍नत Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi फ़्रीक्वेंसी बैंड"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"चेतावनी: आपको अतिरिक्त कैरियर डेटा शुल्क लग सकते हैं."\n\n"टेबलेट सेटअप के लिए महत्वपूर्ण नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"चेतावनी: आपको अतिरिक्त कैरियर डेटा शुल्क लग सकते हैं."\n\n"फ़ोन सेटअप के लिए अत्यधिक नेटवर्क गतिविधि की आवश्यकता हो सकती है."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक टेबलेट सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"चेतावनी: जब तक आपके पास इंटरनेट कनेक्शन न हो, तब तक फ़ोन सत्यापित नहीं कर पाएगा कि आपका सॉफ़्टवेयर अद्यतित है."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"टेबलेट इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"फ़ोन इस Wi-Fi नेटवर्क से कनेक्ट नहीं हो सका था."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"उन्‍नत Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi फ़्रीक्वेंसी बैंड"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"संचालन की फ़्रीक्‍वेंसी रेंज निर्दिष्ट करें"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"फ़्रीक्‍वेंसी बैंड सेट करने में समस्‍या थी."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पता"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"नेटवर्क उपसर्ग लंबाई"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi प्रत्यक्ष"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi प्रत्यक्ष"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"उपकरण जानकारी"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"यह कनेक्‍शन याद रखें"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"उपकरण खोजें"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करें?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"इस समूह को भूलें?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"पोर्टेबल Wi-Fi हॉट स्‍पॉट"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"पोर्टेबल Wi-Fi हॉटस्‍पॉट"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्‍पॉट को चालू किया जा रहा है…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्‍पॉट को बंद किया जा रहा है…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"पोर्टेबल हॉटस्‍पॉट <xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"पोर्टेबल Wi-Fi हॉटस्‍पॉट त्रुटि"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi हॉटस्‍पॉट सेट करें"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"पोर्टेबल Wi-Fi हॉटस्‍पॉट त्रुटि"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"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="display_settings_title" msgid="1708697328627382561">"दिखाएं"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"सिग्‍नल शक्ति"</string>
     <string name="status_roaming" msgid="2638800467430913403">"रोमिंग"</string>
     <string name="status_operator" msgid="2274875196954742087">"नेटवर्क"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC पता"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC पता"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth पता"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"क्रमांक"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"अनुपलब्ध"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN सक्षम"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN अक्षम"</string>
     <string name="bearer" msgid="594270280031923558">"धारक"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO प्रकार"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO मान"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN हटाएं"</string>
     <string name="menu_new" msgid="3014205883303921729">"नया APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"सहेजें"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"सहायता"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"मोबाइल नेटवर्क"</string>
     <string name="location_title" msgid="1029961368397484576">"मेरा स्थान"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi और मोबाइल नेटवर्क स्थान का उपयोग करें"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi और मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"आपके स्थान का तेज़ अनुमान लगाने हेतु, एप्लि. को Google की स्थानीय सेवा का उपयोग करने दें. अज्ञात स्थानीय डेटा एकत्रित करके Google को भेजा जाएगा."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi द्वारा निर्धारित स्‍थान"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi द्वारा निर्धारित किया गया स्‍थान"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS उपग्रह"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"आपके स्थान का पता लगाने के लिए, एप्लिकेशन को आपके टेबलेट पर GPS का उपयोग करने दें"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"आपके स्थान का पता लगाने के लिए, एप्लिकेशन को आपके फ़ोन पर GPS का उपयोग करने दें"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"फ़िल्टर"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"फ़िल्‍टर विकल्‍प चुनें"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"सभी"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"अक्षम"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"डाउनलोड किए गए"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"चालू"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB संग्रहण"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"यदि आप किसी अंतर्निहित एप्लिकेशन को अक्षम करते हैं, तो अन्य एप्लिकेशन का व्यवहार गड़बड़ा सकता है. आपका डेटा भी हटा दिया जाएगा."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"सूचनाएं बंद करें?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"यदि आप इस एप्‍लिकेशन के लिए सूचनाएं बंद करते हैं, तो आप महत्‍वपूर्ण अलर्ट और अपडेट खो देंगे."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"एप्लिकेशन संचालन"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"चल रहा है"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(कभी उपयोग नहीं किया)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"संग्रहण उपयोग"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"एप्‍लिकेशन द्वारा उपयोग किया गया संग्रहण देखें"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"चल रही सेवाएं"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"शब्द:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"शॉर्टकट:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"भाषा:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"कोई शब्द लिखें"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"वैकल्पिक शॉर्टकट"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"शब्‍द संपादित करें"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"संपादित करें"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"हटाएं"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"भौतिक कीबोर्ड सेटिंग"</string>
     <string name="development_settings_title" msgid="215179176067683667">"डेवलपर विकल्प"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"एप्‍लिकेशन विकास के लिए विकल्‍प सेट करें"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"इस उपयोगकर्ता के लिए डेवलपर विकल्प उपलब्ध नहीं हैं"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB डीबग करना"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"डीबग मोड जब USB कनेक्‍ट किया गया हो"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"USB डीबगिंग प्राधिकरणों को निरस्त करें"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"पावर मेनू बग रिपोर्ट"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"बग रिपोर्ट लेने के लिए पावर मेनू में विकल्‍प शामिल करें"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"सचेत रहें"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"विकास सेटिंग की अनुमति दें?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"ये सेटिंग केवल विकास संबंधी उपयोग के प्रयोजन से हैं. वे आपके उपकरण और उस पर स्‍थित एप्लिकेशन को खराब कर सकती हैं या उनके दुर्व्यवहार का कारण हो सकती हैं."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB पर एप्लिकेशन सत्यापित करें"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पावर बटन कॉल बंद करता है"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"पासवर्ड बोलें"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्‍पर्श करके रखने का विलंब"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"वेब पहुंच-योग्यता को उन्नत करें"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"सेटिंग"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"चालू"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"बंद"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"अनुमति है"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"अनुमति नहीं"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"अनुमति दें"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"अनुमति न दें"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g> का उपयोग करें?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> पासवर्ड को छोड़कर, आपके द्वारा लिखा गया सभी पाठ एकत्रित कर सकता है. इसमें व्‍यक्तिगत डेटा, जैसे क्रेडिट कार्ड नंबर शामिल हैं. यह टेबलेट के साथ आपकी सहभागिता का डेटा भी एकत्रित कर सकता है."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> पासवर्ड को छोड़कर, आपके द्वारा लिखा गया सभी पाठ एकत्रित कर सकती है. इसमें व्‍यक्तिगत डेटा, जैसे क्रेडिट कार्ड नंबर शामिल हैं. यह फ़ोन के साथ आपकी सहभागिता का डेटा भी एकत्रित कर सकती है."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g> रोकें?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"ठीक स्‍पर्श करने से <xliff:g id="SERVICE">%1$s</xliff:g> बंद हो जाएगी."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"अपनी कार्यवाही ध्यान से देखें"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"किसी एप्लिकेशन से सहभागिता करते समय सूचनाएं प्राप्त करें."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> को रोकें?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"ठीक स्‍पर्श करने से <xliff:g id="SERVICE">%1$s</xliff:g> बंद हो जाएगी."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"कोई सेवा इंस्‍टॉल नहीं है"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"किसी स्‍क्रीन रीडर की आवश्‍यकता है?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack नेत्रहीन और कम-दृष्टि वाले उपयोगकर्ताओं के लिए बोलकर फ़ीडबैक प्रदान करता है. क्‍या आप इसे Android Market से निशुल्‍क इंस्‍टॉल करना चाहते हैं?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"क्‍या आप चाहते हैं कि एप्लिकेशन Google से उन स्क्रिप्‍ट को इंस्‍टॉल करें जो उनकी वेब सामग्री को अधिक पहुंच योग्‍य बनाती हैं?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"कोई विवरण नहीं दिया गया."</string>
     <string name="settings_button" msgid="3006713718908152930">"सेटिंग"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"बैटरी"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"चार्ज हो रही है"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"स्‍क्रीन चालू"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS चालू"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"सचेत"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"मोबाइल नेटवर्क सिग्‍नल"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"उपकरण सक्रियण समय"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi चालू होने से अब तक समय"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi चालू होने से अब तक समय"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi चालू होने से अब तक का समय"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi चालू होने से अब तक का समय"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास विवरण"</string>
     <string name="details_title" msgid="3792801565213935385">"विवरणों का उपयोग करें"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"पावर उपयोग एडजस्ट करें"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"शामिल पैकेज"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"सेल स्‍टैंडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU अग्रभाग"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"सचेत रखें"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi चल रहा है"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi चल रहा है"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"टेबलेट"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"फ़ोन"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"डेटा भेजा गया"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"एप्‍लिकेशन जानकारी"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"एप्‍लिकेशन सेटिंग"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"स्‍क्रीन सेटिंग"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi सेटिंग"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi सेटिंग"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth सेटिंग"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"ध्‍वनि कॉल द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टेबलेट के निष्‍क्रिय रहने पर उपयोग की गई बैटरी"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"बिना सेट कवरेज वाले क्षेत्रों में पावर बचाने के लिए हवाई जहाज मोड पर स्‍विच करें"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"प्रदर्शन और बैकलाइट द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"स्‍क्रीन की चमक और/या स्‍क्रीन की समयबाह्य अवधि कम करें"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi द्वारा उपयोग की गई बैटरी"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"जब WiFi का उपयोग नहीं हो रहा हो या वह उपलब्‍ध नहीं हो, तो उसे बंद कर दें"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi‑Fi द्वारा उपयोग की गई बैटरी"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"जब Wi-Fi का उपयोग नहीं हो रहा हो या वह उपलब्‍ध नहीं हो, तो उसे बंद कर दें"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth द्वारा उपयोग की गई बैटरी"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"जब आप Bluetooth का उपयोग न कर रहे हों, तो उसे बंद कर दें"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"किसी दूसरे Bluetooth उपकरण से कनेक्‍ट करने का प्रयास करें"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"कॉन्फ़िगर करें"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"अन्‍य इंजन चुनें"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"यह वाक् संश्लेषण इंजन पासवर्ड और क्रेडिट कार्ड नंबर जैसे निजी डेटा समेत आपके द्वारा बोले जाने वाले सभी पाठ को एकत्र कर सकता है. यह <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> इंजन से आता है. इस वाक् संश्लेषण इंजन के उपयोग को सक्षम करें?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"पाठ-से-वाक् आउटपुट के लिए इस भाषा को क्रियाशील नेटवर्क कनेक्शन की आवश्यकता है."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"इंजन"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सेटिंग"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> सक्षम किया गया है"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"पसंदीदा इंजन"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"सामान्य"</string>
     <string name="gadget_title" msgid="5519037532720577836">"पावर नियंत्रण"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi सेटिंग अपडेट कर रहा है"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi सेटिंग अपडेट करना"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth सेटिंग अपडेट कर रहा है"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"चालू"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"बंद"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"चालू हो रहा है"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"बंद हो रहा है"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"समन्वयन करें"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वस्त क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"संग्रहण प्रकार"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक प्रतिमान आरेखित करें"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्‍टॉलेशन की पुष्टि करने के लिए अपना अनलॉक प्रतिमान बनाना होगा."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"बैकअप लें और पुनर्स्‍थापित करें"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"निजी डेटा"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"मेरे डेटा का बैक अप लें"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"एप्‍लिकेशन डेटा, Wi-Fi पासवर्ड और अन्‍य सेटिंग का Google सर्वर पर बैक अप लें"</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="auto_restore_title" msgid="5397528966329126506">"स्‍वचालित पुनर्स्थापना"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"नया पासवर्ड तथा पुष्टि का मिलान नहीं होता है"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"बैकअप पासवर्ड सेट करने में विफल रहा"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"अपने Wi-Fi पासवर्ड, बुकमार्क, अन्य सेटिंग और एप्लिकेशन डेटा का बैक अप लेना रोकें, साथ ही Google सर्वर से सभी प्रतिलिपि मिटाएं?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"अपने Wi-Fi पासवर्ड, बुकमार्क, अन्य सेटिंग और एप्लिकेशन डेटा का बैक अप लेना रोकें, साथ ही Google सर्वर से सभी प्रतियां मिटाएं?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"उपकरण व्‍यवस्‍थापन सेटिंग"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"उपकरण व्‍यवस्‍थापक"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"निष्‍क्रिय करें"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"सूचनाएं"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"कॉल की रिंगटोन और कंपन"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"सिस्टम"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi सेटअप"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट करें"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट कर रहा है..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्‍ट किया गया"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi सेटअप"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट करें"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट हो रहा है…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi‑Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट हो गया"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"कोई नेटवर्क जोड़ें"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"कनेक्ट नहीं है"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"नेटवर्क जोड़ें"</string>
@@ -1555,33 +1587,32 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"कनेक्ट हो रहा है..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"अगले चरण पर जाएं"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"आप सेटअप करते समय किसी EAP Wi-Fi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"आप सेटअप के दौरान किसी EAP Wi-Fi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेटअप करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <!-- syntax error in translation for wifi_setup_description_connected (5235991893829582459) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:192 in     <string name="wifi_setup_description_connected" msgid="5235991893829582459">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" स्‍पर्श करें."\n\n"किसी अन्‍य Wi-Fi नेटवर्क से कनेक्‍ट होने के लिए "</b>"वापस जाएं"<b>" स्पर्श करें."</string>
-)  -->
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" स्पर्श करें."\n\n"किसी भिन्न Wi‑Fi नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" स्पर्श करें."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
     <string name="sync_failed" msgid="1696499856374109647">"समन्‍वयन विफल"</string>
     <string name="sync_active" msgid="8476943765960863040">"समन्‍वयन सक्रिय"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"समन्वयित करें"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"सिंक को वर्तमान में समस्या आ रही है. यह शीघ्र ही वापस उपलब्ध होगा."</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"समन्वयन को वर्तमान में समस्या आ रही है. यह शीघ्र ही वापस उपलब्ध होगा."</string>
     <string name="add_account_label" msgid="7811707265834013767">"खाता जोड़ें"</string>
     <string name="background_data" msgid="5779592891375473817">"पृष्ठभूमि डेटा"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"एप्लि. किसी भी समय डेटा समन्वयित, भेज और प्राप्त कर सकते हैं"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"पृष्ठभू. डेटा अक्षम करें?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"पृष्ठभूमि डेटा को अक्षम करने से बैटरी का जीवनकाल बढ़ जाता है और डेटा उपयोग कम होता है. हो सकता है कि कुछ एप्लिकेशन अब भी पृष्ठभूमि डेटा कनेक्शन का उपयोग करते हों."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"एप्लिकेशन डेटा स्‍वत: समन्‍वयित करें"</string>
-    <string name="sync_enabled" msgid="4551148952179416813">"सिंक चालू है"</string>
-    <string name="sync_disabled" msgid="8511659877596511991">"सिंक बंद है"</string>
-    <string name="sync_error" msgid="5060969083117872149">"सिंक त्रुटि"</string>
+    <string name="sync_enabled" msgid="4551148952179416813">"समन्वयन चालू है"</string>
+    <string name="sync_disabled" msgid="8511659877596511991">"समन्वयन बंद है"</string>
+    <string name="sync_error" msgid="5060969083117872149">"समन्वयन त्रुटि"</string>
     <string name="last_synced" msgid="4242919465367022234">"अंतिम समन्‍वयन <xliff:g id="LAST_SYNC_TIME">%1$s</xliff:g> को किया गया"</string>
     <string name="sync_in_progress" msgid="5151314196536070569">"समन्वयित हो रहा है…"</string>
     <string name="settings_backup" msgid="2274732978260797031">"बैक अप सेटिंग"</string>
     <string name="settings_backup_summary" msgid="7916877705938054035">"मेरी सेटिंग का बैक अप लें"</string>
-    <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी सिंक करें"</string>
-    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"सिंक रद्द करें"</string>
-    <string name="sync_one_time_sync" msgid="6766593624598183090">"अभी सिंक करने के लिए स्पर्श करें<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_menu_sync_now" msgid="6154608350395805683">"अभी समन्वयन करें"</string>
+    <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"समन्वयन रद्द करें"</string>
+    <string name="sync_one_time_sync" msgid="6766593624598183090">"अभी समन्वयन करने के लिए स्पर्श करें<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"कैलेंडर"</string>
@@ -1626,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"डीबग किया गया एप्लि. निष्पादन के पहले अनुलग्न करने हेतु डीबगर की प्रतीक्षा करता है"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"इनपुट"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"आरेखण"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"हार्डवेयर त्वरित रेंडरिंग"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"निगरानी"</string>
     <string name="strict_mode" msgid="1938795874357830695">"सख्‍त मोड सक्षम किया गया"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"जब एप्लि. मुख्‍य थ्रेड पर लंबी कार्यवाही करते हैं तो स्‍क्रीन फ़्लैश करें"</string>
@@ -1643,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"सबसे अच्छे से सबसे खराब: नीला, हरा, हल्का लाल, लाल"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"स्‍क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"ट्रेस सक्षम करें"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"सक्षम ट्रेस को चुनें"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"वर्तमान में कोई ट्रेस सक्षम नहीं है"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"वर्तमान में <xliff:g id="NUM">%1$d</xliff:g> ट्रेस सक्षम हैं"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"वर्तमान में सभी ट्रेस सक्षम हैं"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL चिह्न सक्षम करें"</string>
     <string name="debug_layout" msgid="5981361776594526155">"लेआउट सीमाएं दिखाएं"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"क्लिप सीमाएं, मार्जिन, आदि दिखाएं."</string>
@@ -1657,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"2d आरेखण के लिए GPU का बलपूर्वक उपयोग करें"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA को बाध्य करें"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"OpenGL ES 2.0 एप्लिकेशन में 4x MSAA को सक्षम करें"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"गैर-आयताकार क्लिप परिचालनों को डीबग करें"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"प्रोफ़ाइल GPU रेंडरिंग"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"adb shell dumpsys gfxinfo में रेंडरिंग समय मापें"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"विंडो एनिमेशन स्‍केल"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"संक्रमण एनिमेशन स्‍केल"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"एनिमेटर अवधि स्केल"</string>
@@ -1669,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"पृष्ठभूमि प्रक्रिया सीमा"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"सभी ANR दिखाएं"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"पृष्ठभूमि एप्लि. हेतु एप्लि. प्रतिसाद नहीं दे रहा संवाद दिखाएं"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"प्रायोगिक WebView का उपयोग करें"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"एप्लिकेशन, नवीनतम (बीटा) WebView का उपयोग करेंगे"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"डेटा उपयोग"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"डेटा उपयोग चक्र"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"डेटा रोमिंग"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"पृष्ठभूमि डेटा प्रतिबंधित करें"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G उपयोग अलग करें"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi उपयोग दिखाएं"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wi-Fi उपयोग दिखाएं"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"ईथरनेट उपयोग दिखाएं"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"मोबाइल हॉटस्पॉट"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"स्‍वत: समन्‍वयन डेटा"</string>
@@ -1688,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"मोबाइल डेटा सीमा सेट करें"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G डेटा सीमा सेट करें"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G डेटा सीमा सेट करें"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Wi-Fi डेटा सीमा सेट करें"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi-Fi डेटा सीमा सेट करें"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"ईथरनेट"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"मोबाइल"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1717,25 +1746,25 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"डेटा उपयोग चेतावनी सेट करें"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"डेटा उपयोग की सीमा सेट करें"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"डेटा उपयोग सीमित करना"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका वाहक उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके टेबलेट द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"निर्दिष्ट सीमा तक पहुंचने पर आपका डेटा कनेक्‍शन अक्षम हो जाएगा."\n\n"चूंकि डेटा उपयोग को आपके फ़ोन द्वारा मापा जाता है, और आपका कैरियर उपयोग के लिए भिन्‍न तरह से शुल्क ले सकता है, इसलिए सीमित उपयोग पर विचार करें."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"यदि आप पृष्ठभूमि मोबाइल डेटा प्रतिबंधित करते हैं, तो कुछ एप्लिकेशन और सेवाएं तब तक कार्य नहीं करेंगी जब तक कि आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते."\n\n"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"यदि आप पृष्ठभूमि मोबाइल डेटा प्रतिबंधित करते हैं, तो कुछ एप्लिकेशन और सेवाएं तब तक कार्य नहीं करेंगी जब तक कि आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते."\n\n"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी.."\n\n"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"यदि आप पृष्ठभूमि मोबाइल डेटा को प्रतिबंधित करते हैं, तो जब तक आप Wi-Fi नेटवर्क से कनेक्ट नहीं होते, तब तक कुछ एप्लिकेशन और सेवाएं काम नहीं करेंगी."\n\n"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"चेतावनी"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"सीमा"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"निकाले गए एप्लिकेशन"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"एप्लिकेशन और उपयोगकर्ताओं को निकालें"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> प्राप्त, <xliff:g id="SENT">%2$s</xliff:g> भेजा"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया."</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टेबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपका वाहक डेटा उपयोग के लिए भिन्न तरह से शुल्क ले सकता है."</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके फ़ोन के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपका वाहक डेटा उपयोग के लिए भिन्न तरह से शुल्क ले सकता है."</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके टेबलेट के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपका कैरियर डेटा उपयोग के लिए भिन्न तरह से शुल्क ले सकता है."</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: आपके फ़ोन के द्वारा मापे जाने के अनुसार, लगभग <xliff:g id="TOTAL">%1$s</xliff:g> का उपयोग किया गया. आपका कैरियर डेटा उपयोग के लिए भिन्न तरह से शुल्क ले सकता है."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"मोबाइल हॉटस्पॉट"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"उन WI- Fi नेटवर्क को चुनें जो मोबाइल हॉटस्पॉट हैं. पृष्ठभूमि में होने पर एप्ल‍िकेशन को इन नेटवर्क का उपयोग करने के लिए प्रतिबंधित किया जा सकता है. बड़े डाउनलोड के लिए इन नेटवर्क के उपयोग से पहले एप्लिकेशन चेतावनी भी दे सकते हैं."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"ऐसे WI-Fi नेटवर्क चुनें जो मोबाइल हॉटस्पॉट हैं. पृष्ठभूमि में होने पर एप्ल‍िकेशन को इन नेटवर्क का उपयोग करने से प्रतिबंधित किया जा सकता है. एप्लिकेशन, बड़े डाउनलोड के लिए इन नेटवर्क का उपयोग से पहले चेतावनी भी दे सकते हैं."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"मोबाइल नेटवर्क"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi नेटवर्क"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"मोबाइल हॉटस्पॉट का चयन करने के लिए, Wi-Fi चालू करें."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi नेटवर्क"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"मोबाइल हॉटस्पॉट चुनने के लिए, Wi-Fi चालू करें."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"आपातकालीन कॉल"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"कॉल पर वापस लौटें"</string>
     <string name="vpn_name" msgid="4689699885361002297">"नाम"</string>
@@ -1793,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"अनुमति देने वाला"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"लागू किया जा रहा है"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"उपयोगकर्ता"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"आप"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"अन्य उपयोगकर्ता"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"उपयोगकर्ता जोड़ें"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"सक्रिय"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"सक्रिय नहीं"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"उपयोगकर्ता और प्रोफ़ाइल"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"उपयोगकर्ता या प्रोफ़ाइल जोड़ें"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"प्रतिबंधित प्रोफ़ाइल"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"इससे पहले कि आप कोई प्रतिबंधित प्रोफ़ाइल बनाएं, आपको अपने एप्लिकेशन और व्यक्तिगत डेटा की सुरक्षा करने के लिए एक स्क्रीन लॉक सेट करना होगा."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"लॉक सेट करें"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"सेट नहीं है"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"सेट नहीं की गई - प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_owner" msgid="3879126011135546571">"स्वामी"</string>
+    <string name="user_you" msgid="1639158809315025986">"आप (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"प्रचलित नाम"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"जोड़ें"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"उपयोगकर्ताओं के उनके स्वयं के एप्लिकेशन और सामग्री होती है"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"आप अपने खाते से एप्लिकेशन और सामग्री पर एक्सेस को प्रतिबंधित कर सकते हैं"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"उपयोगकर्ता"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"प्रतिबंधित प्रोफ़ाइल"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"नया उपयोगकर्ता जोड़ें"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वे अपने एप्लिकेशन, वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकते हैं. उपयोगकर्ता Wi-Fi जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है."\n\n"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है."\n\n"कोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"आप अतिरिक्त उपयोगकर्ता बनाकर इस उपकरण को अन्य लोगों से साझा कर सकते हैं. प्रत्येक उपयोगकर्ता के पास अपना स्वयं का स्थान होता है, जिसे वह अपने एप्लिकेशन, वॉलपेपर, और ऐसी ही अन्य चीज़ों के साथ कस्टमाइज़ कर सकता है. उपयोगकर्ता Wi-Fi जैसी अन्य टेबलेट सेटिंग भी एडजस्ट कर सकते हैं जो सभी को प्रभावित करती है."\n\n"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है."\n\n"कोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"आपके द्वारा नया उपयोगकर्ता बनाने के बाद, उस व्यक्ति को सेटअप प्रक्रिया से गुज़रना आवश्यक है."\n\n"कोई भी उपयोगकर्ता अन्य सभी उपयोगकर्ताओं की ओर से अपडेट की गई एप्लिकेशन अनुमतियां स्वीकार कर सकता है."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"उपयोगकर्ता को अभी सेट करें?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"सुनिश्चित करें कि व्यक्ति टेबलेट लेने और अपना स्थान सेट करने के लिए उपलब्ध है"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"प्रोफ़ाइल अभी सेट करें?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"अभी सेट करें"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"अभी नहीं"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"केवल टेबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"प्रतिबंधित प्रोफ़ाइल खाते नहीं जोड़ सकती हैं"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"इस उपकरण से <xliff:g id="USER_NAME">%1$s</xliff:g> को हटाएं"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"नया उपयोगकर्ता"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"नई प्रोफ़ाइल"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"स्वयं को हटाएं?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"उपयोगकर्ता निकालें?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"प्रोफ़ाइल निकालें?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"आप इस टेबलेट पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"आप इस फ़ोन पर अपने स्थान और डेटा को खो देंगे. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"उपयोगकर्ता का स्थान और डेटा इस टेबलेट से निकल जाएगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"उपयोगकर्ता का स्थान और डेटा इस फ़ोन से निकल जाएगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"इस प्रोफ़ाइल का स्थान और डेटा इस टेबलेट पर दिखाई नहीं देगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"इस प्रोफ़ाइल का स्थान और डेटा इस फ़ोन पर दिखाई नहीं देगा. आप इस कार्यवाही को पूर्ववत नहीं कर सकते."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"नया उपयोगकर्ता जोड़ रहा है…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"उपयोगकर्ता हटाएं"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"हटाएं"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"एप्लिकेशन और सामग्री की अनुमति दें"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"प्रतिबंधों वाले एप्लिकेशन"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"एप्लिकेशन सेटिंग विस्तृत करें"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"यह सेटिंग इस टेबलेट के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"यह सेटिंग इस फ़ोन के सभी उपयोगकर्ताओं को प्रभावित करती है."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"भाषा बदलें"</string>
@@ -1831,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"सेल प्रसारण"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"प्रदर्शित करने के लिए आपातकालीन अलर्ट के प्रकारों को चुनें."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"एप्लिकेशन और सामग्री प्रतिबंध"</string>
+    <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"एप्लिकेशन सीमाएं सेट करें"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi और मोबाइल"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi‑Fi और मोबाइल सेटिंग में बदलाव की अनुमति दें"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth युग्‍मन और सेटिंग में बदलाव की अनुमति दें"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"जब टेबलेट अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"जब फ़ोन अन्य उपकरण को स्पर्श करे तो डेटा विनिमय करने दें"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"स्थान पहुंच"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"एप्लिकेशन को आपके स्थान की जानकारी का उपयोग करने दें"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"वापस जाएं"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"अगला"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"समाप्त करें"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"फ़ोटो लें"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"गैलरी से फ़ोटो चुनें"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index c36d6f2..0335e8c 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Sporo"</item>
     <item msgid="1145554631248513562">"Normalni"</item>
     <item msgid="7553665153391107454">"Brzo"</item>
-    <item msgid="2538100882620724753">"Jako brzo"</item>
+    <item msgid="1370673569131070146">"Brže"</item>
+    <item msgid="4648206845228970803">"Vrlo brzo"</item>
+    <item msgid="4977949754169483251">"Ubrzano"</item>
+    <item msgid="6106302964845503577">"Vrlo ubrzano"</item>
+    <item msgid="6800277205640837264">"Najbrže"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Jako nisko"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nijedan"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Neodređeno"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ništa"</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">"Interno pohranjivanje na uređaj"</item>
     <item msgid="3738430123799803530">"Prijenosna SD kartica"</item>
     <item msgid="4498124044785815005">"Neka sustav odluči"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Lokacija"</item>
+    <item msgid="255608127647030286">"Osobno"</item>
+    <item msgid="4588829735729884491">"Slanje poruka"</item>
+    <item msgid="8971765125227378270">"Uređaj"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"približna lokacija"</item>
+    <item msgid="5789673140227507995">"precizna lokacija"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibriranje"</item>
+    <item msgid="3434165993711230924">"čitanje kontakata"</item>
+    <item msgid="616161687718081936">"izmjena kontakata"</item>
+    <item msgid="7638002295329050091">"čitanje zapisnika poziva"</item>
+    <item msgid="6546959730920410907">"izmjena zapisnika poziva"</item>
+    <item msgid="446877710771379667">"čitanje kalendara"</item>
+    <item msgid="7674458294386319722">"izmjena kalendara"</item>
+    <item msgid="8281201165558093009">"skeniranje Wi-Fi-ja"</item>
+    <item msgid="8694611243479480497">"obavijest"</item>
+    <item msgid="7776439107987345446">"skeniranje ćelije"</item>
+    <item msgid="514615766544675057">"poziv na telefon"</item>
+    <item msgid="8181415497109310680">"čitanje SMS-a"</item>
+    <item msgid="6816551144382117307">"pisanje SMS-a"</item>
+    <item msgid="4600463921908905030">"primanje SMS-a"</item>
+    <item msgid="5958926493289432745">"primanje SMS-a u nuždi"</item>
+    <item msgid="4945269495221089540">"primanje MMS-a"</item>
+    <item msgid="5570472453573929087">"primanje WAP obavijesti"</item>
+    <item msgid="7125408150230860501">"slanje SMS-a"</item>
+    <item msgid="7080337936612188061">"čitanje ICC SMS-a"</item>
+    <item msgid="587124103118495063">"pisanje ICC SMS-a"</item>
+    <item msgid="2320577158869025503">"izmjena postavki"</item>
+    <item msgid="1545733463471924009">"povlačenje na vrh"</item>
+    <item msgid="3609046903962454582">"pristup obavijestima"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"snimanje zvuka"</item>
+    <item msgid="5031552983987798163">"reprodukcija audiozapisa"</item>
+    <item msgid="8374996688066472414">"čitaj međuspremnik"</item>
+    <item msgid="3045529469061083747">"izmijeni međuspremnik"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokacija"</item>
+    <item msgid="8677040780775113033">"Lokacija"</item>
+    <item msgid="1660743989948992916">"Lokacija"</item>
+    <item msgid="8791172739860195290">"Vibriranje"</item>
+    <item msgid="383413555642128046">"Čitanje kontakata"</item>
+    <item msgid="3654594895269697313">"Izmjena kontakata"</item>
+    <item msgid="7928393476362362538">"Čitanje zapisnika poziva"</item>
+    <item msgid="6248591205254641116">"Izmjena zapisnika poziva"</item>
+    <item msgid="6093344633066170692">"Čitanje kalendara"</item>
+    <item msgid="1334886368750347692">"Izmjena kalendara"</item>
+    <item msgid="1638204101698708656">"Lokacija"</item>
+    <item msgid="2154671955760380322">"Objavljivanje obavijesti"</item>
+    <item msgid="4282477730595931828">"Lokacija"</item>
+    <item msgid="4891423912898525905">"Poziv na telefon"</item>
+    <item msgid="626463821668200388">"Primanje SMS-a/MMS-a"</item>
+    <item msgid="1237538540368797101">"Slanje SMS-a/MMS-a"</item>
+    <item msgid="3986142739951490025">"Primanje SMS-a/MMS-a"</item>
+    <item msgid="3984213795861739778">"Primanje SMS-a/MMS-a"</item>
+    <item msgid="3656243523752472788">"Primanje SMS-a/MMS-a"</item>
+    <item msgid="8105802370238551510">"Primanje SMS-a/MMS-a"</item>
+    <item msgid="1407766984645388488">"Slanje SMS-a/MMS-a"</item>
+    <item msgid="1530132603376027248">"Primanje SMS-a/MMS-a"</item>
+    <item msgid="1188256962149204607">"Slanje SMS-a/MMS-a"</item>
+    <item msgid="4218544235221631789">"Izmjena postavki"</item>
+    <item msgid="736541391767350377">"Povlačenje na vrh"</item>
+    <item msgid="5530815681721654194">"Pristup obavijestima"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Snimanje zvuka"</item>
+    <item msgid="3493046322001257041">"Reprodukcija audiozapisa"</item>
+    <item msgid="136815868796597058">"Čitaj međuspremnik"</item>
+    <item msgid="5238692940326972503">"Izmijeni međuspremnik"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednje"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"Pozivni snop za funkciju glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Isključeno"</item>
+    <item msgid="675719912558941285">"Plavo nepravokutno područje isječka"</item>
+    <item msgid="1064373276095698656">"Istakni testirane naredbe zelenom"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Isključeno"</item>
+    <item msgid="2751513398307949636">"Na zaslonu u obliku traka"</item>
+    <item msgid="8272260411216018353">"Na zaslonu u obliku crta"</item>
+    <item msgid="120512413928262547">"U naredbi adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna granica"</item>
     <item msgid="4071574792028999443">"Nema pozadinskih procesa"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index f6828af8..b4b0add 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Način rada u zrakoplovu"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Više..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežično povezivanje i mreže"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Poveži se s podatkovnim uslugama u roamingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Poveži se s podatkovnim uslugama u roamingu"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Unesite tekst za prikaz na zaključanom zaslonu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Prikaži podatke o korisniku na zaključanom zaslonu"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podaci o korisniku"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Prikaži informacije profila na zaključanom zaslonu"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informacije profila"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Pristup lokaciji"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sigurnost"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administracija uređaja"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administratori uređaja"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Administratori za prikaz ili deaktivaciju uređaja"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Pristup obavijesti"</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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Uključi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamti postavke"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Bežični prikaz"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Da biste vidjeli uređaje, uključite bežični prikaz."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Bežični prikaz onemogućen je jer je Wi-Fi isključen."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bežični je zaslon onemogućen jer je Wi-Fi isključen."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Traži zaslone"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Pretraživanje..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nije pronađen nijedan bežični zaslon u blizini."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Kada je ta značajka uključena, možete emitirati sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da držite uređaje jedan uz drugi. Na primjer, možete emitirati stranice Preglednika, videozapise s YouTubea, kontakte s Osoba i više."\n\n"Jednostavno približite jedan uređaj drugom (obično se njihove stražnje strane prislanjaju jedna uz drugu), a zatim dodirnite zaslon. Aplikacija određuje što će se emitirati."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Otkrivanje mrežne usluge"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Dopusti aplikacijama na drugim uređajima otkrivanje aplikacija na ovom uređaju"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Uključi Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi postavke"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Postavke Wi-Fi-ja"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Odaberite Wi-Fi mrežu"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Uključivanje značajke Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Isključivanje Wi-Fi mreže..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Odaberite Wi-Fi mrežu"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Uključivanje Wi-Fi-ja…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Isključivanje Wi-Fi-ja…"</string>
     <string name="wifi_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="3038290727701553612">"Obavijesti me ako postoji otvorena mreža"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavati slabe veze"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ne upotrebljavati Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Zadrži Wi-Fi tijekom mirovanja"</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_scan_always_available" msgid="3470564139944368030">"Traženje je uvijek dostupno"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Neka Googleova usluga lokacije i druge aplikacije traže mreže, čak i kada je Wi-Fi isključen"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliranje certifikata"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Radi poboljšavanja preciznosti i u neke druge svrhe Google i ostale aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije mogu tražiti mreže u blizini, čak i kada je Wi-Fi isključen. Ako ne želite da se to događa, idite na opcije Napredno &gt; Traženje je uvijek dostupno."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne prikazuj ponovno"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi tijekom mirovanja"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem s promjenom postavke"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimizacija Wi-Fija"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimiziraj potrošnju baterije kad je Wi-Fi uključen"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fi-ja"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimiziraj potrošnju baterije kad je Wi-Fi uključen"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi mreže"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi mreže"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gumb"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Više opcija"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Unos WPS PIN-a"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Izravni Wi-Fi"</string>
+    <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_connect" msgid="4996220309848349408">"Poveži s mrežom"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zaboravi mrežu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Izmijeni mrežu"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Da biste vidjeli dostupne mreže, uključite Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Traženje Wi-Fi mreža…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Da biste vidjeli dostupne mreže, uključite Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Traženje Wi-Fi mreža…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemate dopuštenje za promjenu Wi‑Fi mreže."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Ostale mreže…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Više"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. postavljanje (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Da bi se postavljanje dovršilo, vaše tabletno računalo treba pristupiti Wi-Fi mreži. Nakon postavljanja možete izmjenjivati mobilnu podatkovnu vezu i Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Da bi se postavljanje dovršilo, vaše tabletno računalo treba pristupiti Wi-Fi mreži. Nakon postavljanja možete izmjenjivati mobilnu podatkovnu vezu i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaži napredne opcije"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Postavljanje zaštićene mreže Wi-Fi"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Povezano s mrežom Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Povezano s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS je već u tijeku, a do završetka može proteći do dvije minute"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Zahtjev nije uspio. Pokušajte ponovo za nekoliko minuta."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sigurnosna postavka (WEP) bežičnog usmjerivača nije podržana"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentifikacija nije uspjela. Pokušajte ponovo."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Otkrivena je još jedna WPS sesija. Pokušajte ponovo za nekoliko minuta."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Mrežni SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Unesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sigurnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jakost signala"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odbij"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Poveži"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zaboravi"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nemoj preskočiti"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"UPOZORENJE: mogući su dodatni troškovi za promet podataka."\n\n"Za postavljanje tabletnog računala može biti potrebna značajna mrežna aktivnost."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORENJE: mogući su dodatni troškovi za promet podataka."\n\n"Za postavljanje telefona može biti potrebna značajna mrežna aktivnost."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UPOZORENJE: tabletno računalo neće moći potvrditi da je vaš softver ažuriran."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UPOZORENJE: telefon neće moći potvrditi da je vaš softver ažuriran."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tabletno računalo nije se moglo povezati s ovom Wi-Fi mrežom."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon se nije mogao povezati s ovom Wi-Fi mrežom."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Napredni Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi pojas frekvencije"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UPOZORENJE: dok ne uspostavite vezu s internetom, tabletno računalo neće moći potvrditi da je vaš softver ažuran."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UPOZORENJE: dok ne uspostavite vezu s internetom, telefon neće moći potvrditi da je vaš softver ažuran."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tabletno računalo nije se moglo povezati s ovom Wi-Fi mrežom."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon se nije mogao povezati s ovom Wi-Fi mrežom."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Napredni Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Pojas frekvencije Wi-Fi mreže"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Odredi raspon frekvencije rada"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problem pri postavljanju pojasa frekvencije."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresa"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Duljina mrežnog prefiksa"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Izravni Wi-Fi"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Izravni Wi-Fi"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Podaci o uređaju"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamti tu vezu"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Traženje uređaja"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati pozivnicu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Želite li otkazati pozivnicu za povezivanje s korisnikom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zaboraviti ovu grupu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosna pristupna WiFi točka"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prijenosna Wi-Fi žarišna točka"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje žarišne točke…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje žarišne točke…"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna WiFi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosne WiFi pristupne točke"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Postavljanje WiFi pristupne točke"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> prijenosna WiFi pristupna točka"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna Wi-Fi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Pogreška prijenosne Wi-Fi žarišne točke"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi žarišne točke"</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="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Jakost signala"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Mreža"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC adresa"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC adresa Wi-Fi-ja"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresa"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijski broj"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nije dostupno"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN omogućen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN onemogućen"</string>
     <string name="bearer" msgid="594270280031923558">"Nositelj"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Vrsta MVNO-a"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Vrijednost MVNO-a"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novi APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Spremi"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoć"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilne mreže"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Lokacija Wi-Fi i mobilne mreže"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi i mob. mreža"</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="7457348712272184793">"Lokacija utvrđena pomoću Wi-Fi točke"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokacija utvrđena pomoću Wi-Fi-ja"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS sateliti"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Omogućite aplikacijama da upotrebljavaju GPS na tabletnom računalu za označavanje vaše lokacije"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Omogućite aplikacijama da upotrebljavaju GPS na vašem telefonu za označavanje vaše lokacije"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Odabir opcije filtra"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Sve"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Onemogućeno"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preuzeto"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pokrenuto"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Memorija USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ako onemogućite ugrađenu aplikaciju, druge aplikacije mogu se ponašati nepredviđeno. Također će se izbrisati vaši podaci."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Isključiti obavijesti?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ako isključite obavijesti za ovu aplikaciju, možda ćete propustiti važna upozorenja i ažuriranja."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Radnje aplikacija"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"U tijeku"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikada nije upotrebljavano)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Upotreba pohrane"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Prikaz pohrane koju upotrebljavaju aplikacije"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Pokrenute usluge"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Riječ:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Prečac:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jezik:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Upišite riječ"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Neobavezni prečac"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Uredi riječ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Uređivanje"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Postavke fizičke tipkovnice"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opcije za razvojne programere"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Postavljanje opcija za razvoj aplikacije"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Opcije razvojnih programera nisu dostupne za ovog korisnika"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Uklanjanje pogreške USB-a"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Uklanjanje pogrešaka s priključenim USB-om"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Opoziv autorizacija za uklanjanje pogrešaka USB-a"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Izvješća o bugovima u izborniku napajanja"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"U izbornik napajanja uključi opciju za izradu izvješća o bugovima"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Ne pokreći mirovanje"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Dopustiti postavke razvojnih programera?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ove su postavke namijenjene samo razvojnim programerima. One mogu uzrokovati kvar ili neželjeno ponašanje vašeg uređaja i aplikacija na njemu."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Potvrdi aplikacije putem USB-a"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Uvećanje zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Autom. ažuriranje uvećanja zaslona"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Ažuriranje uvećanja zaslona pri izmjeni aplikacija"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tipka za uklj./isk. završava poziv"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tipka za uključivanje prekida poziv"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovori zaporke"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Dodirnite i držite odgodu"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Poboljšavanje web-pristupačnosti"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Postavke"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Uključeno"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Isključeno"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dopušteno"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nije dopušteno"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Omogući"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Ne dopusti"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Upotrijebiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> može prikupiti sav tekst koji upisujete, izuzev zaporki. To uključuje osobne podatke kao što su brojevi kreditnih kartica. Također može prikupljati podatke o vašim interakcijama s tabletnim računalom."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> može prikupiti sav tekst koji upisujete, izuzev zaporki. To uključuje osobne podatke kao što su brojevi kreditnih kartica. Također može prikupljati podatke o vašim interakcijama s telefonom."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Ako dodirnete \"U redu\", usluga <xliff:g id="SERVICE">%1$s</xliff:g> zaustavit će se."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Praćenje vaših radnji"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Primajte obavijesti tijekom interakcije s aplikacijom."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Ako dodirnete \"U redu\", usluga <xliff:g id="SERVICE">%1$s</xliff:g> zaustavit će se."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trebate čitač zaslona?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack daje govorne povratne informacije kao pomoć slijepim i slabovidnim korisnicima. Želite li ga besplatno instalirati s usluge Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Želite li da aplikacije instaliraju skripte s Googlea koje će njihov sadržaj učiniti pristupačnijim?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nije dan opis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Postavke"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Punjenje"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Zaslon uključen"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS uključen"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Budan"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilne mreže"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Vrijeme budnosti uređaja"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi na vrijeme"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi na vrijeme"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vrijeme"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vrijeme"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalji povijesti"</string>
     <string name="details_title" msgid="3792801565213935385">"Pojedinosti o upotrebi"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Podesi potrošnju energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Uključeni paketi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Zaslon"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Način čekanja"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Glavni zadatak CPU-a"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zadrži u aktivnom stanju"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi se izvodi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi se izvodi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletni uređaj"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Podaci poslani"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informacije o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Postavke aplikacije"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Postavke zaslona"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi postavke"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Postavke Wi-Fi-ja"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth postavke"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterija upotrijebljena uslugom glasovnog poziva"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Upotreba baterije kad je tabletni uređaj u mirovanju"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Prebacite se na način rada u zrakoplovu u područjima loše pokrivenosti signalom da biste uštedjeli energiju"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterija se koristi za prikaz i pozadinsko svjetlo"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Smanjite svjetlinu i/ili privremeni prekid zaslona"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Baterija iskorištena upotrebom značajke Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Isključi Wi-Fi ako se ne upotrebljava ili ako nije dostupan"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Baterijom se služi Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Isključi Wi-Fi ako se ne upotrebljava ili ako nije dostupan"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Baterija iskorištena upotrebom značajke Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Isključite Bluetooth ako ga ne upotrebljavate"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Pokušajte se povezati s drugim Bluetooth uređajem"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Odaberite drugi alat"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Alat za sintezu govora može prikupljati izgovoreni sadržaj, uključujući osobne podatke kao što su zaporke i brojevi kreditnih kartica. To omogućuje alat <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Želite li omogućiti alat za sintezu govora?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Da bi se dobili izlazni podaci pretvaranja teksta u govor za taj jezik, potrebna je aktivna veza s mrežom."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Alati"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> postavke"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Stavka <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je onemogućena"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni alat"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Opće"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Nadzor nad napajanjem"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ažuriranje Wi-Fi postavki"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ažuriranje Wi-Fi postavki"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ažuriranje postavke Bluetootha"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"uključeno"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"isključeno"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"uključivanje"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"isključivanje"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinkronizacija"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Vrsta pohrane"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardverska"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo softverska"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobni podaci"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Stvori sigurnosnu kopiju mojih podataka"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Stvaranje sigurnosne kopije podataka aplikacije, Wi-Fi zaporki i ostalih postavki na Googleovim poslužiteljima"</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="auto_restore_title" msgid="5397528966329126506">"Automatska obnova"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nova zaporka i potvrda ne odgovaraju"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nije uspjelo postavljanje pričuvne zaporke"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Zaustaviti stvaranje sigurnosnih kopija Wi-Fi zaporki, oznaka, drugih postavki i podataka aplikacije te izbrisati sve kopije na Googleovim poslužiteljima?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Želite li zaustaviti stvaranje sigurnosnih kopija Wi-Fi zaporki, oznaka, drugih postavki i podataka aplikacije te izbrisati sve kopije na Googleovim poslužiteljima?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Postavke administracije uređaja"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator uređaja"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiviraj"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Obavijesti"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Melodija zvona i vibriranje za poziv"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sustav"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Postavljanje Wi-Fi mreže"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Povezano s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Postavljanje Wi-Fi mreže"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Povezivanje s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Povezano s Wi-Fi mrežom <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodavanje mreže"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nije povezan"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj mrežu"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Povezivanje…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Idite na sljedeći korak"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nije podržan."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Ne možete konfigurirati EAP Wi-Fi vezu tijekom postavljanja. To možete učiniti nakon postavljanja u Postavkama pod stavkom Bežično povezivanje i mreže."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Ne možete konfigurirati EAP Wi-Fi vezu tijekom postavljanja. To možete učiniti nakon postavljanja u Postavkama pod stavkom Bežično povezivanje i mreže."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Povezivanje može potrajati nekoliko minuta..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja."\n\n"Dodirnite "<b>"Natrag"</b>" za povezivanje s drugom Wi-Fi mrežom."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja."\n\n"Dodirnite "<b>"Natrag"</b>" za povezivanje s nekom drugom Wi-Fi mrežom."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronizacija je omogućena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Onemogućena je sinkronizacija"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Pogreška sinkronizacije"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacija čeka priključivanje programa za uklanjanje pogrešaka"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Ulaz"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Crtež"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardverski ubrzano renderiranje"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Nadzor"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Omogućen strogi način"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Flash zaslon kada aplikacije na glavnoj niti izvršavaju duge operacije"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Najbolje do najgoreg: plavo, zeleno, svjetlocrveno, crveno"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onemogući HW preklapanja"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Omogući tragove"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Odaberi omogućene tragove"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Trenutačno nema omogućenih tragova"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Broj trenutačno omogućenih tragova: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Svi su tragovi trenutačno omogućeni"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogući OpenGL praćenja"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaži granice izgleda"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Za isječak prikaži granice, margine itd."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Prisilna upotreba GPU-a za 2D crteže"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Nametni 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Omogući 4x MSAA u aplikacijama OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Otkloni pogreške operacija nepravokutnog isječka"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU prikazivanja"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mjeri vrijeme prikaza u adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Razmjer animacije prozora"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Animacija prijelaza razmjera"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Razmjer duljine animatora"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Ograničenje pozadinskog procesa"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Prikaži sve ANR-ove"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Prikaz dijaloga o pozad. aplik. koja ne odgovara"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Eksperimentalni WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikacije će upotrebljavati najnoviji (beta) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Potrošnja podataka"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus upotrebe podataka"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming podataka"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ograničenje pozadinskih podataka"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Zasebna upotreba mreže 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Prikaz upotrebe Wi-Fi mreže"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Prikaz upotrebe Wi-Fi-ja"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Prikaži Ethernet upotrebu"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobilne žarišne točke"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatska sinkronizacija podataka"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ograničenje za mobilne podatke"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Postavi ograničenje za 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Postavi ograničenje za 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Postavi ograničenje za Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ograniči podatke za Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilno"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaše tabletno računalo, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša podatkovna veza mobilnog uređaja bit će onemogućena kada dosegnete navedeno ograničenje."\n\n"Budući da potrošnju podataka mjeri vaš telefon, a vaš mobilni operater možda obračunava na neki drugi način, razmislite o postavljanju opreznijeg ograničenja."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograničenje pozadinskih podataka?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste spojeni na Wi-Fi mrežu."\n\n"Ova postavka utječe na sve korisnike na ovom tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste spojeni na Wi-Fi mrežu."\n\n"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."\n\n"Ova postavka utječe na sve korisnike na ovom tabletnom računalu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ako ograničite pozadinske mobilne podatke, neke aplikacije i usluge neće raditi ako niste povezani s Wi-Fi mrežom."\n\n"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"Upozorenja: <xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12"></font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ograničenje"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Uklonjene aplikacije"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: upotrijebljeno oko <xliff:g id="TOTAL">%1$s</xliff:g>, prema mjerenju tableta. Operater može mjeriti drukčije."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: upotrijebljeno oko <xliff:g id="TOTAL">%1$s</xliff:g>, prema mjerenju telefona. Operater može mjeriti drukčije."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilne žarišne točke"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Odaberite Wi-Fi mreže koje su mobilne žarišne točke. Aplikacijama se može ograničiti upotreba tih mreža dok su u pozadini. Aplikacije također mogu upozoriti prije upotrebe tih mreža za velika preuzimanja."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Odaberite Wi-Fi mreže koje su mobilne žarišne točke. Aplikacijama se može ograničiti upotreba tih mreža dok su u pozadini. Aplikacije također mogu upozoriti prije upotrebe tih mreža za velika preuzimanja."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilne mreže"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi mreže"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Za odabir mobilnih žarišnih točaka uključite Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi mreže"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Za odabir mobilnih žarišnih točaka uključite Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitan poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naziv"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Omogućeno"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Provođenje"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Korisnici"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Vi"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Drugi korisnici"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj korisnika"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktivan"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Nije aktivan"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Korisnici i profili"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Dodavanje korisnika ili profila"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ograničeni profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Prije izrade ograničenog profila trebate postaviti zaključavanje zaslona radi zaštite svojih aplikacija i osobnih podataka."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Postavi zaključavanje"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nije postavljen"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nije postavljen – ograničeni profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlasnik"</string>
+    <string name="user_you" msgid="1639158809315025986">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nadimak"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Dodavanje"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Korisnici imaju vlastite aplikacije i sadržaj"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Možete ograničiti pristup aplikacijama i sadržaju sa svojeg računa"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Korisnik"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ograničeni profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novog korisnika"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ovaj uređaj možete dijeliti s drugima tako da stvorite nove korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi sa svojim aplikacijama, pozadinom i sličnim stvarima. Korisnici također mogu podesiti postavke tabletnog računala, primjerice Wi-Fi, koje utječu na sve."\n\n"Nakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja."\n\n"Bilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ovaj uređaj možete dijeliti s drugima tako da stvorite dodatne korisnike. Svaki korisnik ima vlastiti prostor koji može prilagoditi sa svojim aplikacijama, pozadinskom slikom i sličnim stvarima. Korisnici također mogu podesiti postavke tabletnog računala, primjerice Wi-Fi, koje utječu na sve."\n\n"Nakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja."\n\n"Bilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Nakon što stvorite novog korisnika, ta osoba mora proći postupak postavljanja."\n\n"Bilo koji korisnik može prihvatiti ažurirane dozvole aplikacija u ime svih drugih korisnika."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Postaviti korisnika sada?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Provjerite može li osoba uzeti tabletno računalo i postaviti svoj prostor"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite li sada postaviti profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Postavi sada"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne sad"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Samo vlasnik tabletnog računala može upravljati korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Samo vlasnik telefona može upravljati korisnicima."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu dodavati račune"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g>: brisanje s uređaja"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Ukloniti korisnika?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Ukloniti profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Izgubit ćete svoj prostor i podatke na ovom tabletnom računalu. Ta se radnja ne može poništiti."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Izgubit ćete svoj prostor i podatke na ovom telefonu. Ta se radnja ne može poništiti."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Prostor i podaci tog korisnika nestat će s ovog tabletnog računala. Ta se radnja ne može poništiti."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Prostor i podaci tog korisnika nestat će s ovog telefona. Ta se radnja ne može poništiti."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Prostor i podaci tog profila nestat će s ovog tableta. Tu radnju nije moguće poništiti."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Prostor i podaci tog profila nestat će s ovog telefona. Tu radnju nije moguće poništiti."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Dodavanje novog korisnika…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Izbriši korisnika"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Izbriši"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ova postavka utječe na sve korisnike na ovom tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ova postavka utječe na sve korisnike na ovom telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Promjena jezika"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Poruke mobilne mreže"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Odaberite vrste hitnih obavijesti za prikaz."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Ograničenja aplikacija i sadržaja"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Dopusti izmjene uparivanja i postavki Bluetootha"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Dopusti razmjenu podataka kada tablet dodiruje drugi uređaj"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Dopusti razmjenu podataka kada telefon dodiruje drugi uređaj"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Pristup lokaciji"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Dopusti aplikacijama da upotrebljavaju podatke o lokaciji"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Natrag"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Dalje"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Završi"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Snimite fotografiju"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Odaberite fotografiju iz Galerije"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 1f4bdaa..8903742 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lassú"</item>
     <item msgid="1145554631248513562">"Normál"</item>
     <item msgid="7553665153391107454">"Gyors"</item>
-    <item msgid="2538100882620724753">"Nagyon gyors"</item>
+    <item msgid="1370673569131070146">"Gyorsabb"</item>
+    <item msgid="4648206845228970803">"Nagyon gyors"</item>
+    <item msgid="4977949754169483251">"Gyors"</item>
+    <item msgid="6106302964845503577">"Rendkívül gyors"</item>
+    <item msgid="6800277205640837264">"Leggyorsabb"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Nagyon alacsony"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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,12 +153,12 @@
   </string-array>
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Mindig"</item>
-    <item msgid="844721238536786870">"Csak ha csatlakoztatva van"</item>
+    <item msgid="844721238536786870">"Csak ha töltőn van"</item>
     <item msgid="2990218920631468642">"Soha (növeli az adatforgalmat)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Mindig"</item>
-    <item msgid="7433294150916905997">"Csak ha csatlakoztatva van"</item>
+    <item msgid="7433294150916905997">"Csak ha töltőn van"</item>
     <item msgid="1390404486722375028">"Soha"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"Nyilvános webes meghajtó"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nincs"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Semelyik"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nem meghatározott"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Nincs"</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">"Belső tárhely"</item>
     <item msgid="3738430123799803530">"Eltávolítható SD-kártya"</item>
     <item msgid="4498124044785815005">"Döntse el a rendszer"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Hely"</item>
+    <item msgid="255608127647030286">"Személyes"</item>
+    <item msgid="4588829735729884491">"Üzenetváltás"</item>
+    <item msgid="8971765125227378270">"Eszköz"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"hozzávetőleges helymeghatározás"</item>
+    <item msgid="5789673140227507995">"pontos helymeghatározás"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"rezgés"</item>
+    <item msgid="3434165993711230924">"névjegyek olvasása"</item>
+    <item msgid="616161687718081936">"névjegyek módosítása"</item>
+    <item msgid="7638002295329050091">"hívásnapló olvasása"</item>
+    <item msgid="6546959730920410907">"hívásnapló módosítása"</item>
+    <item msgid="446877710771379667">"naptár olvasása"</item>
+    <item msgid="7674458294386319722">"naptár módosítása"</item>
+    <item msgid="8281201165558093009">"wi-fi hálózat keresése"</item>
+    <item msgid="8694611243479480497">"értesítés"</item>
+    <item msgid="7776439107987345446">"hálózatkeresés"</item>
+    <item msgid="514615766544675057">"telefonálás"</item>
+    <item msgid="8181415497109310680">"SMS olvasása"</item>
+    <item msgid="6816551144382117307">"SMS írása"</item>
+    <item msgid="4600463921908905030">"SMS fogadása"</item>
+    <item msgid="5958926493289432745">"sürgősségi SMS fogadása"</item>
+    <item msgid="4945269495221089540">"MMS fogadása"</item>
+    <item msgid="5570472453573929087">"WAP push fogadása"</item>
+    <item msgid="7125408150230860501">"SMS küldése"</item>
+    <item msgid="7080337936612188061">"ICC SMS olvasása"</item>
+    <item msgid="587124103118495063">"ICC SMS írása"</item>
+    <item msgid="2320577158869025503">"beállítások módosítása"</item>
+    <item msgid="1545733463471924009">"megjelenítés felül"</item>
+    <item msgid="3609046903962454582">"Hozzáférési értesítések"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"hanganyag rögzítése"</item>
+    <item msgid="5031552983987798163">"hanganyag lejátszása"</item>
+    <item msgid="8374996688066472414">"vágólap olvasása"</item>
+    <item msgid="3045529469061083747">"vágólap módosítása"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Hely"</item>
+    <item msgid="8677040780775113033">"Hely"</item>
+    <item msgid="1660743989948992916">"Hely"</item>
+    <item msgid="8791172739860195290">"Rezgés"</item>
+    <item msgid="383413555642128046">"Névjegyek olvasása"</item>
+    <item msgid="3654594895269697313">"Névjegyek módosítása"</item>
+    <item msgid="7928393476362362538">"Hívásnapló olvasása"</item>
+    <item msgid="6248591205254641116">"Hívásnapló módosítása"</item>
+    <item msgid="6093344633066170692">"Naptár olvasása"</item>
+    <item msgid="1334886368750347692">"Naptár módosítása"</item>
+    <item msgid="1638204101698708656">"Hely"</item>
+    <item msgid="2154671955760380322">"Értesítés közzététele"</item>
+    <item msgid="4282477730595931828">"Hely"</item>
+    <item msgid="4891423912898525905">"Telefonálás"</item>
+    <item msgid="626463821668200388">"SMS/MMS fogadása"</item>
+    <item msgid="1237538540368797101">"SMS/MMS küldése"</item>
+    <item msgid="3986142739951490025">"SMS/MMS fogadása"</item>
+    <item msgid="3984213795861739778">"SMS/MMS fogadása"</item>
+    <item msgid="3656243523752472788">"SMS/MMS fogadása"</item>
+    <item msgid="8105802370238551510">"SMS/MMS fogadása"</item>
+    <item msgid="1407766984645388488">"SMS/MMS küldése"</item>
+    <item msgid="1530132603376027248">"SMS/MMS fogadása"</item>
+    <item msgid="1188256962149204607">"SMS/MMS küldése"</item>
+    <item msgid="4218544235221631789">"Beállítások módosítása"</item>
+    <item msgid="736541391767350377">"Megjelenítés felül"</item>
+    <item msgid="5530815681721654194">"Hozzáférési értesítések"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Hanganyag rögzítése"</item>
+    <item msgid="3493046322001257041">"Hanganyag lejátszása"</item>
+    <item msgid="136815868796597058">"Vágólap olvasása"</item>
+    <item msgid="5238692940326972503">"Vágólap módosítása"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Rövid"</item>
     <item msgid="2560532955514699713">"Közepes"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"Verem meghívása glGetError esetén"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Kikapcsolva"</item>
+    <item msgid="675719912558941285">"Nem négyzetes kivágás kékkel"</item>
+    <item msgid="1064373276095698656">"Tesztelt rajzolási parancsok kiemelése zölddel"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Ki"</item>
+    <item msgid="2751513398307949636">"A képernyőn sávként"</item>
+    <item msgid="8272260411216018353">"A képernyőn sorként"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo elemben"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Normál korlátozás"</item>
     <item msgid="4071574792028999443">"Nincsenek háttérfolyamatok"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a613ac8..56691c9 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Repülőgép üzemmód"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Továbbiak..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Vezeték nélküli és egyéb hálózatok"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"A Wi-Fi, a Bluetooth, a repülőgép mód, a mobilhálózatok és a VPN-ek kezelése"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"A Wi-Fi, a Bluetooth, a repülős üzemmód, a mobilhálózatok és a VPN-ek kezelése"</string>
     <string name="roaming" msgid="3596055926335478572">"Adatbarangolás"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Csatlakozás adatszolgáltatásokhoz barangolás során"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Írja be a lezárt képernyőn megjelenítendő szöveget"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Felhasználói adatok megjelenítése zárolt képernyőn"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Felhasználói adatok"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profiladatok megjelenítése a lezáró képernyőn"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profiladatok"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Helyhozzáférés"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Biztonság"</string>
     <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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Eszközfelügyelet"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Eszköz-rendszergazdák"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Az eszköz rendszergazdáinak megtekintése vagy deaktiválása"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth bekapcsolása"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Beállítások megjegyzése"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Vezeték nélküli kijelző"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Az eszközök megtekintéséhez kapcsolja be a vezeték nélküli kijelzőt."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"A vezeték nélküli kijelző le van tiltva, mert a Wi-Fi ki van kapcsolva."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"A vezeték nélküli kijelző le van tiltva, mert a Wi-Fi ki van kapcsolva."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Kijelzők keresése"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Keresés..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nem található a közelben vezeték nélküli kijelző."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Ha ez a funkció be van kapcsolva, alkalmazástartalmat sugározhat át egy másik NFC-kompatibilis eszközre úgy, hogy egymáshoz közel tartja az eszközöket. Például átsugározhat böngészőoldalalakat, YouTube-videókat, névjegyeket stb."\n\n"Mindössze helyezze az eszközöket egymáshoz közel (lehetőleg a hátlapjaikat összeérintve), majd érintse meg a képernyőt. Az alkalmazás eldönti, hogy mit fog átsugározni."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Hálózati szolgáltatások keresése"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Más eszközökön lévő alkalmazások láthatják az ezen a készüléken lévő alkalmazásokat."</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi bekapcsolása"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi beállítások"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi bekapcsolása"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi beállítások"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Vezeték nélküli hozzáférési pontok beállítása és kezelése"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wi-Fi hálózat kiválasztása"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi bekapcsolása?"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi kikapcsolása..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi hálózat kiválasztása"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Bekapcsolja a Wi-Fit?"</string>
+    <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="3038290727701553612">"Értesítést kérek az elérhető nyitott hálózatokról"</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="2466956369738047669">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Tartsa bekapcsolva a Wi-Fit alvás közben"</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_scan_always_available" msgid="3470564139944368030">"A keresés mindig elérhető"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Tanúsítványok telepítése"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"A hely pontosságának javítása és egyéb célok érdekében a Google és más alkalmazások kereshetnek közeli Wi-Fi hálózatokat még akkor is, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Az alkalmazások még akkor is megkereshetik a közeli hálózatokat, ha a Wi-Fi ki van kapcsolva. Ha nem szeretné ezt, állítsa át a Speciális &gt; A keresés mindig elérhető beállítást."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ne jelenjen meg többé"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tartsa bekapcsolva a Wi-Fit alvó üzemmódban"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Probléma adódott a beállítás megváltoztatásakor"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi optimalizálása"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Az akkumulátorhasználat minimalizálása, ha a Wi-Fi be van kapcsolva"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi optimalizálása"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Az akkumulátorhasználat minimalizálása, ha a Wi-Fi be van kapcsolva"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Hálózat hozzáadása"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi hálózatok"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi hálózatok"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS gomb"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"További lehetőségek"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kód megadása"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Csatlakozás hálózathoz"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Hálózat elfelejtése"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Hálózat módosítása"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Kapcsolja be a WiFi-t a hálózatok megjelenítéséhez"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fi hálózatok keresése..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kapcsolja be a Wi-Fit a hálózatok megjelenítéséhez"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi hálózatok keresése..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nincs jogosultsága a Wi‑Fi hálózat módosítására."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Másik hálózat..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Egyebek"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automat. beállítás (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"A telepítés befejezéséhez a táblagépnek Wi-Fi hálózatra van szüksége. A beállítás után válthat a mobil adatforgalom és a Wi-Fi között."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"A telepítés befejezéséhez a táblagépnek Wi-Fi hálózatra van szüksége. A beállítás után válthat a mobil adatforgalom és a Wi-Fi között."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Speciális beállítások megjelenítése"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS"</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="7204827509934892103">"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="8067502591043979939">"Í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_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_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="5754399645462924103">"Csatlakozva a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi 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>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"A WPS már folyamatban van, és legfeljebb 2 percet vesz igénybe."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Sikertelen WPS. Kérjük, próbálkozzon újra néhány perc múlva."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A vezeték nélküli router biztonsági beállítása (WEP) nem támogatott."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Azonsítási hiba. Kérjük, próbálja újra."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Egy másik WPS-munkamenetet észleltünk. Kérjük, próbálkozzon újra néhány perc múlva."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Hálózati SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID megadása"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Biztonság"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Jelerősség"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Állapot"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</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\n"Engedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Elutasítás"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kapcsolódás"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elfelejt"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Ne hagyja ki"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"FIGYELEM: Előfordulhat, hogy szolgáltatója további adatátviteli díjakat számít fel."\n\n"A táblagép beállításához jelentős hálózati tevékenységre lehet szükség."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"FIGYELEM: Előfordulhat, hogy szolgáltatója további adatátviteli díjakat számít fel."\n\n"A telefon beállításához jelentős hálózati tevékenységre lehet szükség."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"FIGYELEM: A táblagép nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"FIGYELEM: A telefon nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"A táblagép nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"A telefon nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Haladó Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frekvenciasáv"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"FIGYELEM: amíg nincs internetkapcsolat, a táblagép nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"FIGYELEM: amíg nincs internetkapcsolat, a telefon nem tudja ellenőrizni, hogy a szoftver naprakész-e."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"A táblagép nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"A telefon nem tudott csatlakozni ehhez a Wi-Fi hálózathoz."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Haladó Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi frekvenciasáv"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Adja meg a működési frekvenciatartományt"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Hiba történt a frekvenciasáv beállítása során."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-cím"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Átjáró"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Hálózati előtag hossza"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Készülékadatok"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"A kapcsolat megjegyzése"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Eszközök keresése"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Törli a meghívást?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Szeretné törölni a(z) <xliff:g id="PEER_NAME">%1$s</xliff:g> eszközhöz való csatlakozásra vonatkozó meghívást?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Elfelejtse ezt a csoportot?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hordozható Wi-Fi hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot bekapcsolása..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kikapcsolása..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"A(z) <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hordozható hotspot aktív"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"A hordozható Wi-Fi hotspot hibája"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi hotspot beállítása"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"A hordozható Wi-Fi hotspottal kapcsolatos hiba"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi hotspot beállítása"</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="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
@@ -709,7 +731,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Keresés"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Keresési beállítások és előzmények kezelése"</string>
     <string name="display_settings" msgid="7965901687241669598">"Megjelenítés"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Képernyő automatikus forgatása"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Automatikus képernyőforgatás"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tájolás automatikus váltása a telefon elfordításakor"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Jelerősség"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Barangolás"</string>
     <string name="status_operator" msgid="2274875196954742087">"Hálózat"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi eszköz MAC-címe"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi eszköz MAC-címe"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-cím"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sorozatszám"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nem érhető el"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN engedélyezve"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN kikapcsolva"</string>
     <string name="bearer" msgid="594270280031923558">"Tulajdonos"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO típus"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO érték"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN törlése"</string>
     <string name="menu_new" msgid="3014205883303921729">"Új APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Mentés"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Súgó"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilhálózatok"</string>
     <string name="location_title" msgid="1029961368397484576">"Saját pozíció"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Hely Wi-Fi és mobilhálózat alapján"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Hely Wi-Fi és mobilhálózat 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="7457348712272184793">"Helymeghatározás Wi-Fi-vel"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Helymeghatározás Wi-Fi-vel"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-műholdak"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Engedélyezze az alkalmazások számára a GPS használatát a táblagépén a tartózkodási helyének meghatározásához"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Engedélyezze az alkalmazások számára a GPS használatát a telefonján a tartózkodási helyének meghatározásához"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Szűrő"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Válasszon szűrési lehetőségeket"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Összes"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Nincs engedélyezve"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Letöltött"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Futó"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-tár"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ha letilt egy beépített alkalmazást, lehet, hogy más alkalmazások sem fognak megfelelően működni. Az adatok is törlődnek."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Kikapcsolja az értesítéseket?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ha kikapcsolja az erre az alkalmazásra vonatkozó értesítéseket, akkor lemaradhat fontos figyelmeztetésekről és a frissítésekről."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Alkalmazásműveletek"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Fut"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(nem használt)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Tárhely-használat"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Alkalmazások által használt tárhely megtekintése"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Futó szolgáltatások"</string>
@@ -1192,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fizikai billentyűzet beállításai"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"A \".\" beillesztéséhez kétszer kell lenyomni a szóköz billentyűt"</string>
     <string name="show_password" msgid="3001113966880559611">"Jelszó láthatóvá tétele"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Ez a beviteli módszer alkalmas lehet a beírt szövegek -– köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok –- összegyűjtésére. A(z) <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> alkalmazás kapcsolta be. Használja ezt a módszert?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Ez a beviteli módszer alkalmas lehet a beírt szövegek – köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok - összegyűjtésére. A <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> alkalmazás kapcsolta be. Használja ezt a módszert?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Lehetséges, hogy ez a helyesírás-ellenőrző összegyűjti a beírt szövegeket, beleértve a személyes adatokat, mint amilyenek a jelszavak és bankkártyaszámok. A(z) <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> alkalmazástól származik. Használja ezt a helyesírás-ellenőrzőt?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Beállítások"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Nyelv"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Szó:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Parancsikon:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Nyelv:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Szó beírása"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Választható gyorsparancs"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Szó szerkesztése"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Szerkesztés"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Törlés"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fizikai billentyűzet beállításai"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Fejlesztői lehetőségek"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Alkalmazásfejlesztési beállítások megadása"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"A fejlesztői lehetőségek nem érhetők el ennél a felhasználónál"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB hibakeresés"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Hibakeresés mód USB csatlakoztatásakor"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"USB-s hibakeresésre vonatkozó engedélyek visszavonása"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Hibajelentések az energiaellátási menüben"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lehetőség az energiaellátási menüben a hibajelentésekre"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nem kapcsolódik ki"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Engedélyezi a fejlesztői beállításokat?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ezek a beállítások csak fejlesztői használatra szolgálnak. Használatuk esetén eszköze vagy alkalmazásai meghibásodhatnak, illetve nem várt módon viselkedhetnek."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB-n keresztül telepített alkalmazások ellenőrzése"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"A bekapcsoló gomb megszakítja a hívást"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Jelszavak kimondása"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Érintés és tartási késleltetés"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Webelérhetőség fokozása"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Beállítások"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"be"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Ki"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Engedélyezett"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nem lehetséges"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Engedélyezés"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Tiltás"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Használja a következő szolgáltatást: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"A(z) <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> összegyűjti az összes beírt szöveget, kivéve a jelszavakat. Ez magában foglalja a személyes adatokat, például a bankkártyaszámokat. A táblagépével való interakciójáról is gyűjthet adatokat."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"A(z) <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> összegyűjti az összes beírt szöveget, kivéve a jelszavakat. Ez magában foglalja a személyes adatokat, például a bankkártyaszámokat. A telefonnal való interakciójáról is gyűjthet adatokat."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Az OK gomb megnyomásával leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Műveletek megfigyelése"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Értesítések fogadása alkalmazás használatakor."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Az OK gomb megérintésével leállítja a következőt: <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nincs telepített szolgáltatás"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Képernyőolvasóra van szüksége?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"A TalkBack beszéddel történő visszajelzést kínál vak és gyengénlátó felhasználók számára. Szeretné ingyen telepíteni az Android Marketről?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Szeretné, ha az alkalmazások telepíthetnének olyan szkripteket a Google-tól, melyek révén az internetes tartalom még inkább hozzáférhetővé válik?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nincs leírás."</string>
     <string name="settings_button" msgid="3006713718908152930">"Beállítások"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akkumulátor"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Töltés"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Bekapcsolt képernyővel"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS bekapcsolva"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ébren"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobil hálózat jele"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Eszköz készenléti ideje"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi időben"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi időben"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi időben"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi időben"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Előzmények részletei"</string>
     <string name="details_title" msgid="3792801565213935385">"Használat részletei"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Az energiafelhasználás beállítása"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Mellékelt csomagok"</string>
     <string name="power_screen" msgid="3023346080675904613">"Képernyő"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cella készenlét"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hanghívások"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU-használat az előtérben"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ébren tartás"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi használat"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi használat"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Táblagép"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Elküldött adatok"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Alkalmazásinformáció"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Alkalmazásbeállítások"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Képernyő-beállítások"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi beállítások"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi beállítások"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-beállítások"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Hanghívások által felhasznált energia"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Energiahasználat tétlenség során"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Ahol nincs lefedettség, váltson repülőgép módra, hogy spóroljon az energiával"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"A kijelző és a háttérfény által felhasznált energia"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Csökkentse a képernyő fényerejét és kikapcsolási idejét"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi által felhasznált energia"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Kapcsolja ki a Wi-Fit, ha nem használja, vagy amikor nincs elérhető hálózat"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi által felhasznált energia"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Kapcsolja ki a Wi-Fit, ha nem használja, vagy amikor nincs elérhető hálózat"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth által felhasznált energia"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Ha nem használja, kapcsolja ki a Bluetooth funkciót"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Próbáljon meg csatlakozni egy másik Bluetooth-eszközhöz"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurálás"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Válasszon másik motort"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ez a beviteli módszer alkalmas lehet az elhangzott szövegek -- köztük az olyan személyes adatok, mint a jelszavak és a hitelkártyaszámok -- összegyűjtésére. A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motor kapcsolta be. Engedélyezi ennek a beszédszintetizáló motornak a használatát?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Ez a nyelv működő hálózati kapcsolatot igényel a szövegfelolvasáshoz."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorok"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> beállításai"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"A(z) <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engedélyezve van"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferált motor"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Általános"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiagazdálkodás"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi beállítás frissítése"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi beállítás frissítése"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth beállítások frissítése"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"be"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"ki"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"bekapcsolás"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"kikapcsolás"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Szinkronizálás"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolítása"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tárhelytípus"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"hardveresen támogatott"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"kizárólag szoftveres"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Biztonsági mentés és visszaállítás"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Személyes adatok"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Adatok biztonsági mentése"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Alkalmazásadatok, Wi-Fi jelszavak és egyéb beállítások mentése a Google szervereire"</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="auto_restore_title" msgid="5397528966329126506">"Automatikus helyreállítás"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Az új jelszó és a megerősítése nem egyezik."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Hiba a biztonsági jelszó beállítása során"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fi jelszavak, könyvjelzők, egyéb beállítások és alkalmazásadatok biztonsági mentésének kikapcsolása, valamint a Google szerverein lévő összes példány törlése?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Kikapcsolja a Wi-Fi jelszavakat, könyvjelzőket, egyéb beállításokat és alkalmazásadatok biztonsági mentését, illetve törli a Google szerverein lévő összes példányt?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Eszközkezelői beállítások"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Eszközkezelő"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiválás"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Értesítések"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Csengőhang és rezgés beállításai"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Rendszer"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi beállítása"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Csatlakozás <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Csatlakozás a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Csatlakozva <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi beállítása"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Csatlakozás a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Csatlakozás a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Csatlakozva a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Hálózat hozzáadása"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nincs csatlakozva:"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Hálózat hozzáadása"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Csatlakozás…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Ugrás a következő lépésre"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nem támogatott."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"A beállítás során nem konfigurálhat EAP Wi-Fi kapcsolatot. Ezt a beállítás után a Beállításokban teheti meg, a Vezeték nélküli és egyéb hálózatok menüpontban."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"A beállítás során nem állíthat be EAP Wi-Fi kapcsolatot. Ezt a beállítás után a Beállításokban teheti meg, a Vezeték nélküli és egyéb hálózatok menüpontban."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"A kapcsolódás igénybe vehet pár percet..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Érintse meg a "<b>"Tovább"</b>" lehetőséget a telepítés folytatásához."\n\n"Érintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Érintse meg a "<b>"Tovább"</b>" lehetőséget a telepítés folytatásához."\n\n"Érintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Szinkronizálás engedélyezve"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Szinkronizálás letiltva"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Szinkronizálási hiba"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"A javított alkalmazás a hibakeresőre vár."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Bevitel"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Rajz"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Hardveres gyorsítású megjelenítés"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Figyelés"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Szigorú mód engedélyezve"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Képernyővillogás a fő szál hosszú műveleteinél"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Legjobbtól a legrosszabbig: kék, zöld, piros"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW fedvények letiltása"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Nyomkövetés engedélyezése"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Eng. nyomkövetés kivál."</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Jelenleg nincs engedélyezett nyomkövetés."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Jelenleg <xliff:g id="NUM">%1$d</xliff:g> nyomkövetés engedélyezett."</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Jelenleg minden nyomkövetés engedélyezve van."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL nyomon követése"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Elrendezéshatár mutatása"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"GPU használatának kényszerítése 2D rajzhoz"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA kényszerítése"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"A 4x MSAA engedélyezése az OpenGL ES 2.0-nál"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Nem négyzetes kivágási műveletek hibakeresése"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU-renderelésről"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Renderelési idő mérés ADB shell dumpsys gfxinfoban"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ablakanimáció mérete"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Háttérfolyamat-korlátozás"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Összes ANR mutatása"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Az Alkalmazás nem válaszol ablak megjelenítése"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Kísérleti WebView haszn."</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Alkalmazások a legújabb (béta) WebView-val"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Adathasználat"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Adatforgalmi ciklus"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Adatbarangolás"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Háttéradatok korlátozása"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Külön 4G-használat"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi forgalom megjelenítése"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wi-Fi forgalom mutatása"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-használat megjelenítése"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobil hotspotok"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Adatok automatikus szinkronizálása"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Mobil adatkorlát beállítása"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G adatkorlát beállítása"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G adatkorlát beállítása"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Wi-Fi adatkorlát beállítása"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi-Fi adatkorlát"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a táblagép méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A mobilhálózat adatkapcsolatát a rendszer letiltja a megadott korlát elérésekor."\n\n"Mivel az adathasználatot a telefon méri, és a szolgáltató mérése eltérhet ettől, célszerű óvatosabb korlátot beállítani."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Korlátozza a háttéradatokat?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ha korlátozza a háttérben zajló mobiladat-forgalmat, néhány alkalmazás és szolgáltatás nem fog működni, ha a Wi-Fi nincs engedélyezve."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ha korlátozza a háttérben zajló mobil adatforgalmat, néhány alkalmazás és szolgáltatás nem fog működni, ha a Wi-Fi nincs engedélyezve."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ha korlátozza a háttérben futó mobil adatátvitelt, bizonyos alkalmazások és szolgáltatások nem fognak működni, amíg nem kapcsolódik Wi-Fi hálózathoz."\n\n"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"figyelmeztetés"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"korlát"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Eltávolított alkalmazások"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva a táblagép szerint. A szolgáltatói mérés eltérhet ettől."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: kb. <xliff:g id="TOTAL">%1$s</xliff:g> felhasználva a telefon szerint. A szolgáltatói mérés eltérhet ettől."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobil hotspotok"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Válassza ki azokat a Wi-Fi hálózatokat, amelyek mobil hotspotok. A háttérben futó alkalmazásoknál letilthatja az ilyen hálózatok használatát. Az alkalmazások akár értesíthetik is Önt, mielőtt nagyméretű letöltésekre használnák az ilyen hálózatokat."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Válassza ki azokat a Wi-Fi hálózatokat, amelyek mobil hotspotok. A háttérben futó alkalmazásoknál letilthatja az ilyen hálózatok használatát. Az alkalmazások akár értesíthetik is Önt, mielőtt nagyméretű letöltésekre használnák az ilyen hálózatokat."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilhálózatok"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi hálózatok"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"A mobil hotspotok kiválasztásához kapcsolja be a Wi-Fit."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi hálózatok"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"A mobil hotspotok kiválasztásához kapcsolja be a Wi-Fit."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Segélyhívás"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Hívás folytatása"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Név"</string>
@@ -1794,34 +1824,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Engedélyezve"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Kényszerítve"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Felhasználók"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Ön"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Egyéb felhasználók"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktív"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inaktív"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Felhasználók és profilok"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Felhasználó vagy profil hozzáadása"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Korlátozott jogokkal rendelkező profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Mielőtt létrehozhatna egy korlátozott profilt, be kell állítania egy képernyőzárat, hogy megvédje alkalmazásait és személyes adatait."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Képernyőzár beállítása"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nincs beállítva"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nincs létrehozva – Korlátozott jogokkal rendelkező profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Tulajdonos"</string>
+    <string name="user_you" msgid="1639158809315025986">"Ön (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Becenév"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Hozzáadás"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"A felhasználóknak saját alkalmazásaik és tartalmaik vannak"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Korlátozhatja az alkalmazásokhoz és tartalmakhoz való hozzáférést a fiókjából"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Felhasználó"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Korlátozott profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Új felhasználó hozzáadása"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ezt a készüléket további felhasználókat létrehozva megoszthatja más emberekkel. Minden felhasználó rendelkezik saját térrel, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják a táblagép olyan beállításait is, amelyek mindenkit érintenek, például a Wi-Fi beállításait."\n" "\n"Miután létrehoz egy új felhasználót, az adott személynek keresztül kell mennie egy telepítési folyamaton."\n" "\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ezt a készüléket további felhasználókat létrehozva megoszthatja más személyekkel. Minden felhasználó rendelkezik saját térrel, amelyet személyre szabhat saját alkalmazásaival, háttérképével stb. A felhasználók módosíthatják a táblagép olyan beállításait is, amelyek mindenkit érintenek, például a Wi-Fi beállításait."\n" "\n"Miután létrehoz egy új felhasználót, az adott személynek el kell végeznie egy telepítési folyamatot."\n\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Miután létrehozott egy új felhasználót, az adott személynek keresztül kell mennie egy telepítési folyamaton."\n" "\n"Minden felhasználó elfogadhatja a frissített alkalmazások engedélyeit az összes többi felhasználó nevében."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Beállít most egy felhasználót?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Győződjön meg arról, hogy a személy hozzá tud férni a táblagéphez, hogy beállíthassa a területét"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Létrehoz most egy profilt?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Beállítás most"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Most nem"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Csak a táblagép tulajdonosa kezelheti a felhasználókat."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Csak a telefon tulajdonosa kezelheti a felhasználókat."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Korlátozott profilok nem adhatnak hozzá fiókokat"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> törlése"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Új felhasználó"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Új profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Törli önmagát?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Törli a felhasználót?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Eltávolítja a profilt?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Az Ön tárhelye és adatai el fognak tűnni a táblagépről. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Az Ön tárhelye és adatai el fognak tűnni a telefonról. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"A felhasználó tárhelye és adatai el fognak tűnni a táblagépről. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"A felhasználó tárhelye és adatai el fognak tűnni a telefonról. Ezt a műveletet nem lehet visszavonni."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"A profil tárhelye és adatai el fognak tűnni a táblagépről. Ezt a műveletet nem lehet visszavonni."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"A profil tárhelye és adatai el fognak tűnni a telefonról. Ezt a műveletet nem lehet visszavonni."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Új felhasználó hozzáadása..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Felhasználó törlése"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Törlés"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ez a beállítás minden felhasználót érint ezen a táblagépen."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ez a beállítás minden felhasználót érint ezen a telefonon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Nyelv módosítása"</string>
@@ -1832,4 +1878,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Fotóazonosító"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cellán belüli adások"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Válassza ki a megjelenítendő vészriasztások típusait."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Alkalmazás- és tartalomkorlátozások"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ÁTNEVEZÉS"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"A bluetoothos párosítások és beállítások engedélyezése"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Lehetővé teszi az adatcserét, ha a táblagép érintkezik egy másik eszközzel."</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Lehetővé teszi az adatcserét, ha a telefon érintkezik egy másik készülékkel."</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Helyhozzáférés"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Az alkalmazások használhatják a helyadatokat."</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Vissza"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Tovább"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Befejezés"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Fotó készítése"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Fotó kiválasztása a Galériából"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 6d0ff16..baa34d0 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lambat"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Cepat"</item>
-    <item msgid="2538100882620724753">"Sangat cepat"</item>
+    <item msgid="1370673569131070146">"Lebih cepat"</item>
+    <item msgid="4648206845228970803">"Sangat cepat"</item>
+    <item msgid="4977949754169483251">"Cepat sekali"</item>
+    <item msgid="6106302964845503577">"Sangat cepat sekali"</item>
+    <item msgid="6800277205640837264">"Tercepat"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Sangat rendah"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Tidak Ada"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tak Satu Pun"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Tidak ditentukan"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Tidak ada"</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">"Penyimpanan perangkat internal"</item>
     <item msgid="3738430123799803530">"Kartu SD yang dapat dicopot"</item>
     <item msgid="4498124044785815005">"Biarkan sistem menentukan"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Lokasi"</item>
+    <item msgid="255608127647030286">"Pribadi"</item>
+    <item msgid="4588829735729884491">"Perpesanan"</item>
+    <item msgid="8971765125227378270">"Perangkat"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"lokasi sementara"</item>
+    <item msgid="5789673140227507995">"lokasi terperinci"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"getar"</item>
+    <item msgid="3434165993711230924">"membaca kontak"</item>
+    <item msgid="616161687718081936">"ubah kontak"</item>
+    <item msgid="7638002295329050091">"baca log panggilan"</item>
+    <item msgid="6546959730920410907">"ubah log panggilan"</item>
+    <item msgid="446877710771379667">"membaca kalender"</item>
+    <item msgid="7674458294386319722">"ubah kalender"</item>
+    <item msgid="8281201165558093009">"pemindaian Wi-Fi"</item>
+    <item msgid="8694611243479480497">"pemberitahuan"</item>
+    <item msgid="7776439107987345446">"pemindaian seluler"</item>
+    <item msgid="514615766544675057">"telepon"</item>
+    <item msgid="8181415497109310680">"baca SMS"</item>
+    <item msgid="6816551144382117307">"tulis SMS"</item>
+    <item msgid="4600463921908905030">"terima SMS"</item>
+    <item msgid="5958926493289432745">"terima SMS darurat"</item>
+    <item msgid="4945269495221089540">"terima MMS"</item>
+    <item msgid="5570472453573929087">"terima WAP push"</item>
+    <item msgid="7125408150230860501">"kirim SMS"</item>
+    <item msgid="7080337936612188061">"baca ICC SMS"</item>
+    <item msgid="587124103118495063">"tulis ICC SMS"</item>
+    <item msgid="2320577158869025503">"ubah setelan"</item>
+    <item msgid="1545733463471924009">"gambar di atas"</item>
+    <item msgid="3609046903962454582">"akses pemberitahuan"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"rekam audio"</item>
+    <item msgid="5031552983987798163">"putar audio"</item>
+    <item msgid="8374996688066472414">"baca papan klip"</item>
+    <item msgid="3045529469061083747">"ubah papan klip"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasi"</item>
+    <item msgid="8677040780775113033">"Lokasi"</item>
+    <item msgid="1660743989948992916">"Lokasi"</item>
+    <item msgid="8791172739860195290">"Getar"</item>
+    <item msgid="383413555642128046">"Membaca kontak"</item>
+    <item msgid="3654594895269697313">"Ubah kontak"</item>
+    <item msgid="7928393476362362538">"Baca log panggilan"</item>
+    <item msgid="6248591205254641116">"Ubah log panggilan"</item>
+    <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="4282477730595931828">"Lokasi"</item>
+    <item msgid="4891423912898525905">"Telepon"</item>
+    <item msgid="626463821668200388">"Terima SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Kirim SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Terima SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Terima SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Terima SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Terima SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Kirim SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Terima SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Kirim SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Ubah setelan"</item>
+    <item msgid="736541391767350377">"Gambar di atas"</item>
+    <item msgid="5530815681721654194">"Akses pemberitahuan"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rekam audio"</item>
+    <item msgid="3493046322001257041">"Putar audio"</item>
+    <item msgid="136815868796597058">"Baca papan klip"</item>
+    <item msgid="5238692940326972503">"Ubah papan klip"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Singkat"</item>
     <item msgid="2560532955514699713">"Sedang"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Grafis)"</item>
     <item msgid="1340692776955662664">"Panggil tumpukan di glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Nonaktif"</item>
+    <item msgid="675719912558941285">"Gambar wilayah non-kotak biru"</item>
+    <item msgid="1064373276095698656">"Sorot perintah gambar teruji hijau"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Nonaktif"</item>
+    <item msgid="2751513398307949636">"Di layar dalam bentuk batang"</item>
+    <item msgid="8272260411216018353">"Di layar dalam bentuk garis"</item>
+    <item msgid="120512413928262547">"Di adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Batas standar"</item>
     <item msgid="4071574792028999443">"Tanpa proses latar belakang"</item>
@@ -287,7 +388,7 @@
     <item msgid="6692305604213080515">"Memulai..."</item>
     <item msgid="8001704909356800092">"Menyambung…"</item>
     <item msgid="4039737283841672166">"Terhubung"</item>
-    <item msgid="4042143101664725090">"Waktu tunggu"</item>
+    <item msgid="4042143101664725090">"Waktu habis"</item>
     <item msgid="7664124146786465092">"Gagal"</item>
   </string-array>
   <string-array name="security_settings_premium_sms_values">
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2427eea..9d1e67d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Mode pesawat"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Selengkapnya..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Jaringan &amp; nirkabel"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Kelola Wi-Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Kelola Wi-Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming data"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Sambungkan ke layanan data ketika roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Sambungkan ke layanan data ketika roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ketikkan teks untuk ditampilkan pada layar kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tampilkan info pengguna pada layar pengunci"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info pengguna"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tampilkan info profil di layar kunci"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Info profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Akses lokasi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Keamanan"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administrasi perangkat"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administrator perangkat"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nonaktifkan administrator perangkat"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Hidupkan Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat setelan"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Layar nirkabel"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Untuk melihat perangkat, nyalakan layar nirkabel."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Layar nirkabel dinonaktifkan karena Wi-Fi mati."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Layar nirkabel dinonaktifkan karena Wi-Fi mati."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Telusuri layar"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Menelusuri..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Tidak menemukan layar nirkabel terdekat"</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Jika fitur ini dihidupkan, Anda dapat memancarkan konten apl ke perangkat berkemampuan NFC lainnya dengan mendekatkan kedua perangkat. Contohnya, Anda dapat memancarkan laman Browser, video YouTube, kontak Orang, dan lain-lain."\n\n"Cukup dekatkan kedua perangkat (biasanya saling membelakangi) lalu sentuh layar Anda. Apl ini akan menentukan apa yang dipancarkan."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Penemuan layanan jaringan"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Izinkan aplikasi di perangkat lain menemukan aplikasi di perangkat ini"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Hidupkan Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Setelan Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Nyalakan Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Setelan Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Siapkan &amp; kelola titik akses nirkabel"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Pilih Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Menyalakan Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Mematikan Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pilih Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Menyalakan Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Mematikan Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Kesalahan"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Dalam mode Pesawat"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak dapat memindai jaringan"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Pemberitahuan jaringan"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Beri tahu saya ketika tersedia jaringan terbuka"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Hindari sambungan buruk"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Jangan gunakan jaringan Wi-Fi kecuali sambungan internetnya baik"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Terus nyalakan Wi-Fi selama dalam mode tidur"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Jangan gunakan jaringan Wi-Fi kecuali koneksi internetnya bagus"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Pemindaian selalu tersedia"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Izinkan layanan lokasi Google dan aplikasi lain memindai jaringan, bahkan saat Wi-Fi tidak aktif"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sertifikat"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk meningkatkan akurasi lokasi dan untuk tujuan lainnya, Google dan aplikasi lainnya dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikasi dapat memindai jaringan terdekat, bahkan saat Wi-Fi mati. Jika Anda tidak ingin ini terjadi, buka Lanjutan &gt; Pemindaian selalu tersedia."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tampilkan lagi"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi nyala saat mode tidur"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ada masalah saat mengubah setelan"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Pengoptimalan Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalkan penggunaan baterai saat Wi-Fi aktif"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pengoptimalan Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalkan penggunaan baterai saat Wi-Fi aktif"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambahkan jaringan"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Jaringan Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Jaringan Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tombol Tekan WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Opsi lainnya"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entri Pin WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Langsung"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Pindai"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Lanjutan"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Hubungkan ke jaringan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Utk melihat jaringan yg tersedia, hidupkan Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Menelusuri jaringan Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lihat jaringan yang ada dengan menyalakan Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Menelusuri jaringan Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tidak memiliki izin untuk mengubah jaringan Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Jaringan lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lainnya"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Penyiapan otomatis (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Untuk menyelesaikan penyiapan, tablet Anda perlu mengakses Wi-Fi. Setelah penyiapan, Anda dapat beralih antara data seluler dan Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Untuk menyelesaikan penyiapan, tablet Anda perlu akses ke Wi-Fi. Setelah penyiapan, Anda dapat beralih antara data seluler dan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tampilkan opsi lanjutan"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Penyiapan Wi-Fi yang Dilindungi"</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="7204827509934892103">"Tekan tombol Penyiapan Wi-FI yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk selesai."</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_pin" msgid="223344506445335358">"Masukkan PIN <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. 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="5754399645462924103">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS sedang berlangsung dan memerlukan waktu hingga dua menit untuk selesai"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Gagal memulai WPS. Coba lagi setelah beberapa menit."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Pengaturan keamanan router nirkabel (TKIP) tidak didukung"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Harap coba lagi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Terdeteksi sesi WPS lainnya. Coba lagi setelah beberapa menit."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID jaringan"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Masukkan SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keamanan"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan sinyal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Izinkan ini untuk semua aplikasi yang ingin memindai?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tolak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambungkan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Jangan lewati"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"PERINGATAN: Anda mungkin dikenai tagihan data operator tambahan."\n\n"Penyiapan tablet mungkin memerlukan aktivitas jaringan yang signifikan."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"PERINGATAN: Anda mungkin dikenai tagihan data operator tambahan."\n\n"Penyiapan ponsel mungkin memerlukan aktivitas jaringan yang signifikan."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"PERINGATAN: Tablet tidak akan dapat memverifikasi bahwa perangkat lunak Anda sudah diperbarui."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"PERINGATAN: Ponsel tidak akan dapat memverifikasi bahwa perangkat lunak Anda sudah diperbarui."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Ponsel tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Lanjutan"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pita frekuensi Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"PERINGATAN: Hingga Anda memiliki koneksi internet, tablet tidak akan dapat memverifikasi bahwa perangkat lunak Anda telah diperbarui."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"PERINGATAN: Hingga Anda memiliki koneksi internet, ponsel tidak akan dapat memverifikasi bahwa perangkat lunak Anda telah diperbarui."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ponsel tidak dapat menyambung ke jaringan Wi-Fi ini."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Pita frekuensi Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan rentang frekuensi operasi"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ada masalah saat menyetel pita frekuensi."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan jaringan"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Langsung"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informasi perangkat"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ingat sambungan ini"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Telusuri perangkat"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan undangan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Apakah Anda ingin membatalkan undangan untuk tersambung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan grup ini?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Menyalakan hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> hotspot portabel aktif"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kesalahan hotspot Wi-Fi portabel"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Siapkan hotspot Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Kesalahan hotspot Wi-Fi portabel"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Siapkan hotspot 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> hotspot Wi-Fi portabel"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
@@ -709,7 +731,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Telusuri"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan riwayat penelusuran"</string>
     <string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Putar layar secara otomatis"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Rotasi layar otomatis"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Kekuatan sinyal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Jaringan"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Alamat MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nomor seri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Tidak Tersedia"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN diaktifkan"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN dinonaktifkan"</string>
     <string name="bearer" msgid="594270280031923558">"Operator"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Jenis MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Nilai MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Hapus APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN baru"</string>
     <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Jaringan seluler"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasiku"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Lokasi jaringan Wi-Fi &amp; seluler"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Lokasi 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="7457348712272184793">"Lokasi yang dipastikan oleh Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi yang ditentukan oleh Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Mengizinkan aplikasi menggunakan GPS di tablet untuk menunjukkan lokasi Anda"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Mengizinkan aplikasi menggunakan GPS di telepon untuk menunjukkan lokasi Anda"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pilih opsi filter"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Semua"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Dinonaktifkan"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Terunduh"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Menjalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Penyimpanan USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Jika Anda menonaktifkan aplikasi yang ada di dalamnya, aplikasi lain mungkin ikut terpengaruh. Data Anda juga akan dihapus."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Nonaktifkan pemberitahuan?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika Anda mematikan pemberitahuan untuk aplikasi ini, Anda dapat melewatkan pembaruan dan lansiran penting."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Pengoperasian aplikasi"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Berjalan"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan penyimpanan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat penyimpanan yang digunakan apl"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Layanan yang sedang berjalan"</string>
@@ -1192,8 +1220,8 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Setelan keyboard fisik"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tekan Spasi dua kali untuk memasukkan \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Perlihatkan sandi"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Metode masukan ini mungkin dapat mengumpulkan semua teks yang Anda ketik, termasuk data pribadi seperti sandi dan nomor kartu kredit. Metode ini berasal dari apl <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gunakan metode masukan ini?"</string>
-    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Pemeriksa ejaan ini mungkin dapat mengumpulkan semua teks yang Anda ketik, termasuk data pribadi seperti sandi dan nomor kartu kredit. Pemeriksa ejaan ini berasal dari apl <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gunakan pemeriksa ejaan ini?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Metode masukan ini mungkin dapat mengumpulkan semua teks yang Anda ketik, termasuk data pribadi seperti sandi dan nomor kartu kredit. Metode ini berasal dari aplikasi <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Gunakan metode masukan ini?"</string>
+    <string name="spellchecker_security_warning" msgid="9060897418527708922">"Pemeriksa ejaan ini mungkin dapat mengumpulkan semua teks yang Anda ketik, termasuk data pribadi seperti sandi dan nomor kartu kredit. Pemeriksa ejaan ini berasal dari aplikasi <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Gunakan pemeriksa ejaan ini?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Setelan"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Bahasa"</string>
     <string name="failed_to_open_app_settings_toast" msgid="1251067459298072462">"Gagal membuka setelan untuk <xliff:g id="SPELL_APPLICATION_NAME">%1$s</xliff:g>"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Kata:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Pintasan:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Bahasa:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Ketik kata"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Pintasan opsional"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit kata"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Hapus"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setelan keyboard fisik"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opsi pengembang"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Menyetel opsi untuk pengembangan apl"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Opsi pengembang tidak tersedia untuk pengguna ini"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugging USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode debug ketika USB tersambung"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Cabut otorisasi debug USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Laporan bug menu daya"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Menyertakan opsi dalam menu daya untuk mengambil laporan bug"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap terjaga"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Izinkan setelan pengembangan?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Setelan ini hanya dimaksudkan untuk penggunaan pengembangan. Setelan dapat menyebabkan perangkat dan aplikasi yang menerapkannya rusak atau tidak berfungsi semestinya."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifikasi aplikasi melalui USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Perbarui otomatis pembesaran layar"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Perbarui pembesaran layar di transisi aplikasi"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya - tutup telepon  panggilan"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tombol daya - tutup telepon"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Ucapkan sandi"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Penundaan sentuh &amp; tahan"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tingkatkan aksesibilitas web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setelan"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aktif"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Nonaktif"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Diizinkan"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Tidak diizinkan"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Izinkan"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Jangan izinkan"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> dapat mengumpulkan semua teks yang Anda ketik, kecuali sandi. Pengumpulan ini mencakup data pribadi seperti nomor kartu kredit. Layanan ini juga dapat mengumpulkan data tentang interaksi Anda dengan tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> dapat mengumpulkan semua teks yang Anda ketik, kecuali sandi. Pengumpulan ini mencakup data pribadi seperti nomor kartu kredit. Layanan ini juga dapat mengumpulkan data tentang interaksi Anda dengan ponsel."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Menyentuh Oke akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Mengamati tindakan Anda"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Menerima pemberitahuan saat Anda berinteraksi dengan aplikasi."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tidak ada layanan terpasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlu pembaca layar?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan masukan lisan untuk membantu pengguna yang buta dan tidak terlalu baik penglihatannya. Apakah Anda ingin memasangnya secara gratis dari Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Apakah Anda ingin apl memasang skrip dari Google yang membuat konten webnya lebih mudah diakses?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tidak tersedia deskripsi."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setelan"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterai"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Membebankan"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Layar hidup"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS menyala"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktif"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinyal jaringan seluler"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Waktu bangun perangkat"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi berdasarkan waktu"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi berdasarkan waktu"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi berdasarkan waktu"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi berdasarkan waktu"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detail riwayat"</string>
     <string name="details_title" msgid="3792801565213935385">"Gunakan detail"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Sesuaikan penggunaan daya"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Termasuk paket"</string>
     <string name="power_screen" msgid="3023346080675904613">"Layar"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Sel siaga"</string>
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Tetap aktif"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi berjalan"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi berjalan"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telepon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data terkirim"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info apl"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Setelan apl"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Setelan layar"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Setelan Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Setelan Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Setelan bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterai digunakan oleh panggilan suara"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Baterai digunakan saat tablet menganggur"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Beralih ke mode pesawat untuk menghemat daya di area tanpa layanan"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterai digunakan oleh tampilan dan lampu latar"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Redupkan layar dan/atau waktu tunggu layar"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Baterai digunakan oleh Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Matikan Wi-Fi ketika tidak digunakan atau ketika tidak tersedia"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Baterai digunakan oleh Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Matikan Wi-Fi ketika tidak digunakan atau ketika tidak tersedia"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Baterai digunakan oleh Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Matikan Bluetooth ketika tidak digunakan"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Coba sambungkan ke perangkat Bluetooth lainnya"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasikan"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih mesin lain"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Mesin sintesis suara ini mungkin dapat mengumpulkan semua teks yang akan diucapkan, termasuk di antaranya data pribadi seperti sandi dan nomor kartu kredit. Berasal dari <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> aplikasi. Gunakan metode masukan ini?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bahasa ini perlu sambungan jaringan yang bekerja untuk keluaran text-to-speech."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mesin"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> setelan"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> diaktifkan"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mesin yang dipilih"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrol daya"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Memperbarui setelan Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Memperbarui setelan Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Memperbarui setelan Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"aktif"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"nonaktif"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"mengaktifkan"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"menonaktifkan"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinkronisasi"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Jenis penyimpanan"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Menggunakan perangkat keras"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Khusus perangkat lunak"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Mencadangkan &amp; memulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data pribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Mencadangkan dataku"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Mencadangkan data apl, sandi Wi-Fi, dan setelan lainnya ke server Google"</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="auto_restore_title" msgid="5397528966329126506">"Pemulihan otomatis"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Sandi baru dan konfirmasinya tidak cocok."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Gagal saat menyetel sandi cadangan"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Hentikan mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data apl, serta menghapus semua salinan di server Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Berhenti mencadangkan sandi Wi-Fi, bookmark, setelan lainnya, dan data aplikasi, serta menghapus semua salinan di server Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setelan administrasi perangkat"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator perangkat"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Nonaktifkan"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Pemberitahuan"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Nada dering &amp; getar panggilan"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Penyiapan Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Sambungkan ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Menyambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Penyiapan Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Sambungkan ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Menyambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Tambahkan jaringan"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Tidak terhubung"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tambahkan jaringan"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Menyambungkan..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Lanjutkan ke langkah berikutnya"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP tidak didukung."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Anda tidak dapat mengonfigurasi sambungan Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Setelan &gt; Nirkabel &amp; jaringan."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Anda tidak dapat mengonfigurasi sambungan Wi-Fi EAP selama penyiapan. Setelah penyiapan, Anda dapat melakukannya di Setelan &gt; Nirkabel &amp; jaringan."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Menyambungkan membutuhkan waktu beberapa menit..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan. "\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung dengan jaringan Wi-Fi yang berbeda."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan."\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung ke jaringan Wi-Fi lain."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Kesalahan sinkronisasi."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikasi yang di-debug menunggu debugger menempel sebelum berjalan"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Masukan"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Gambar"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Render yang dipercepat perangkat keras"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Memantau"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Mode ketat diaktifkan"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Kedipkan layar saat apl beroperasi lama pada utas utama"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Terbaik-terburuk: biru, hijau, merah terang, merah"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Nonaktifkan lapisan HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Aktifkan jejak"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Pilih jejak yang diaktifkan"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Tidak ada jejak yang saat ini diaktifkan"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> jejak saat ini diaktifkan"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Semua jejak saat ini diaktifkan"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktifkan jejak OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tampilkan batas tata letak"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Tampilkan batas klip, margin, dll."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Paksa penggunaan GPU untuk gambar 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Aktifkan 4x MSAA dalam aplikasi OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Debug operasi klip non-kotak"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Penguraian GPU profil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Ukur waktu penguraian di adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi jendela"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi transisi"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala durasi animator"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Batas proses latar blkg"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tampilkan semua ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tmplkn dialog Apl Tidak Merespons utk apl ltr blkg"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Pakai WebView Eksperimental"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikasi akan menggunakan WebView (beta) terbaru"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Daur penggunaan data"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming data"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Batasi data latar belakang"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Pisahkan penggunaan 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tampilkan penggunaan Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Tampilkan penggunaan Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Tampilkan penggunaan Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Hotspot seluler"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sinkronisasi data otomatis"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Tetapkan batas data seluler"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Tetapkan batas data 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Tetapkan batas data 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Tetapkan batas data Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Tetapkan batas data Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Seluler"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh tablet Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data seluler Anda akan dinonaktifkan ketika mencapai batas yang ditentukan."\n\n"Karena penggunaan data dihitung oleh ponsel Anda, dan operator Anda mungkin menghitung penggunaan secara berbeda, pertimbangkan untuk menggunakan batas yang konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Batasi data latar belakang?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jika Anda membatasi data latar belakang seluler, beberapa apl dan layanan tidak akan berfungsi kecuali jika Anda terhubung ke jaringan Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan bekerja kecuali Anda tersambung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan bekerja kecuali Anda tersambung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali jika Anda terhubung ke jaringan Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali Anda terhubung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jika Anda membatasi data seluler latar belakang, beberapa aplikasi dan layanan tidak akan berfungsi kecuali Anda terhubung ke jaringan Wi-Fi."\n\n"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"peringatan"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"batas"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dihapus"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut tablet. Hitungan data operator dapat berbeda."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: sekitar <xliff:g id="TOTAL">%1$s</xliff:g> yang digunakan menurut ponsel. Hitungan data operator dapat berbeda."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspot seluler"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Pilih jaringan Wi-Fi yang hotspot seluler. Aplikasi dapat dibatasi dari menggunakan jaringan ini ketika berada di latar belakang. Aplikasi juga dapat memperingatkan sebelum menggunakan jaringan ini untuk unduhan yang besar."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Pilih jaringan Wi-Fi yang merupakan hotspot seluler. Aplikasi dapat dibatasi agar tidak menggunakan jaringan ini ketika berada di latar belakang. Aplikasi juga dapat memperingatkan sebelum menggunakan jaringan ini untuk unduhan berukuran besar."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Jaringan seluler"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Jaringan Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Untuk memilih hotspot seluler, nyalakan Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Jaringan Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Untuk memilih hotspot seluler, nyalakan Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan darurat"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nama"</string>
@@ -1749,8 +1779,8 @@
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Sertifikat server IPSec"</string>
     <string name="vpn_show_options" msgid="7182688955890457003">"Tampilkan opsi lanjutan"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Domain penelusuran DNS"</string>
-    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (mis. 8.8.8.8)"</string>
-    <string name="vpn_routes" msgid="3818655448226312232">"Rute penerusan (mis. 10.0.0.0/8)"</string>
+    <string name="vpn_dns_servers" msgid="5570715561245741829">"Server DNS (misal: 8.8.8.8)"</string>
+    <string name="vpn_routes" msgid="3818655448226312232">"Rute penerusan (misal: 10.0.0.0/8)"</string>
     <string name="vpn_username" msgid="1863901629860867849">"Nama pengguna"</string>
     <string name="vpn_password" msgid="6756043647233596772">"Sandi"</string>
     <string name="vpn_save_login" msgid="6350322456427484881">"Simpan informasi akun"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Tidak Wajib"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Wajib"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Anda"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Pengguna lainnya"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Tambahkan pengguna"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktif"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Tidak aktif"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Tambahkan pengguna atau profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil dibatasi"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Sebelum dapat membuat profil yang dibatasi, Anda perlu menyiapkan kunci layar untuk melindungi aplikasi dan data pribadi Anda."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Setel kunci"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disiapkan"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Tidak disiapkan - Profil dibatasi"</string>
     <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
+    <string name="user_you" msgid="1639158809315025986">"Anda (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nama julukan"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Tambahkan"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Pengguna memiliki aplikasi dan konten mereka sendiri"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Anda dapat membatasi akses ke aplikasi dan konten dari akun Anda"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil dibatasi"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambahkan pengguna baru"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Anda dapat membagikan perangkat ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruangnya sendiri, yang dapat mereka sesuaikan dengan aplikasi, wallpaper, dan lainnya. Pengguna juga dapat menyesuaikan setelan tablet seperti Wi-Fi yang memengaruhi siapa saja."\n\n"Setelah Anda membuat pengguna baru, orang tersebut perlu menjalani proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Anda dapat berbagi perangkat ini bersama orang lain dengan membuat pengguna tambahan. Setiap pengguna memiliki ruangnya sendiri yang dapat disesuaikan dengan aplikasinya sendiri, wallpaper, dan sebagainya. Pengguna juga dapat menyesuaikan setelan tablet seperti Wi-Fi yang memengaruhi siapa saja."\n\n"Setelah Anda membuat pengguna baru, orang tersebut harus melakukan proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Setelah Anda membuat pengguna baru, orang tersebut perlu menjalani proses penyiapan."\n\n"Setiap pengguna dapat menerima izin aplikasi yang diperbarui atas nama semua pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Siapkan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Pastikan orang tersebut tersedia untuk mengambil tablet dan menyiapkan ruangnya"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Siapkan profil sekarang?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Siapkan sekarang"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Tidak sekarang"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Hanya pemilik tablet yang dapat mengelola pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Hanya pemilik ponsel yang dapat mengelola pengguna."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang dibatasi tidak dapat menambahkan akun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Hapus <xliff:g id="USER_NAME">%1$s</xliff:g> di perangkat"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baru"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baru"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Hapus diri Anda sendiri?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Hapus pengguna"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Hapus profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ruang dan data Anda akan hilang dari tablet ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ruang dan data Anda akan hilang dari ponsel ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Ruang dan data pengguna ini akan hilang dari tablet ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Ruang dan data pengguna ini akan hilang dari ponsel ini. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Ruang dan data profil akan hilang dari tablet ini. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Ruang dan data profil akan hilang dari ponsel ini. Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Menambahkan pengguna baru..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Hapus pengguna"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Hapus"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Setelan ini memengaruhi semua pengguna di tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Setelan ini memengaruhi semua pengguna di ponsel ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ubah bahasa"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis peringatan darurat yang akan ditampilkan."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Pembatasan aplikasi dan konten"</string>
+    <string name="user_rename" msgid="8523499513614655279">"GANTI NAMA"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Setel batas 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Memungkinkan modifikasi setelan dan penyandingan Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Memungkinkan pertukaran data saat tablet bersentuhan dengan perangkat lain"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Memungkinkan pertukaran data saat ponsel bersentuhan dengan perangkat lain"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Akses lokasi"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Memungkinkan aplikasi menggunakan informasi lokasi Anda"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Kembali"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Berikutnya"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Selesai"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Ambil foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Pilih foto dari Galeri"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 9ce958a..8763dc4 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lenta"</item>
     <item msgid="1145554631248513562">"Normale"</item>
     <item msgid="7553665153391107454">"Veloce"</item>
-    <item msgid="2538100882620724753">"Molto veloce"</item>
+    <item msgid="1370673569131070146">"Più veloce"</item>
+    <item msgid="4648206845228970803">"Molto veloce"</item>
+    <item msgid="4977949754169483251">"Rapida"</item>
+    <item msgid="6106302964845503577">"Molto rapida"</item>
+    <item msgid="6800277205640837264">"Massima velocità"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Molto basso"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nessuno"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nessuna"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Non specificato"</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">"Memorizzazione su dispositivo interno"</item>
     <item msgid="3738430123799803530">"Scheda SD rimovibile"</item>
     <item msgid="4498124044785815005">"Impostazione di sistema"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Posizione"</item>
+    <item msgid="255608127647030286">"Personali"</item>
+    <item msgid="4588829735729884491">"Messaggi"</item>
+    <item msgid="8971765125227378270">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"posizione approssimativa"</item>
+    <item msgid="5789673140227507995">"posizione precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrazione"</item>
+    <item msgid="3434165993711230924">"lettura contatti"</item>
+    <item msgid="616161687718081936">"modifica dei contatti"</item>
+    <item msgid="7638002295329050091">"lettura del registro chiamate"</item>
+    <item msgid="6546959730920410907">"modifica del registro chiamate"</item>
+    <item msgid="446877710771379667">"lettura calendario"</item>
+    <item msgid="7674458294386319722">"modifica del calendario"</item>
+    <item msgid="8281201165558093009">"scansione Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notifica"</item>
+    <item msgid="7776439107987345446">"scansione cell"</item>
+    <item msgid="514615766544675057">"chiamate telefono"</item>
+    <item msgid="8181415497109310680">"lettura SMS"</item>
+    <item msgid="6816551144382117307">"scrittura SMS"</item>
+    <item msgid="4600463921908905030">"ricezione SMS"</item>
+    <item msgid="5958926493289432745">"ricezione SMS di emergenza"</item>
+    <item msgid="4945269495221089540">"ricezione MMS"</item>
+    <item msgid="5570472453573929087">"ricezione push WAP"</item>
+    <item msgid="7125408150230860501">"invio SMS"</item>
+    <item msgid="7080337936612188061">"lettura SMS ICC"</item>
+    <item msgid="587124103118495063">"scrittura SMS ICC"</item>
+    <item msgid="2320577158869025503">"modifica delle impostazioni"</item>
+    <item msgid="1545733463471924009">"traccia in alto"</item>
+    <item msgid="3609046903962454582">"accesso a notifiche"</item>
+    <item msgid="4671646036128214513">"fotocamera"</item>
+    <item msgid="1097324338692486211">"registrazione audio"</item>
+    <item msgid="5031552983987798163">"riproduzione audio"</item>
+    <item msgid="8374996688066472414">"lettura degli appunti"</item>
+    <item msgid="3045529469061083747">"modifica degli appunti"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Posizione"</item>
+    <item msgid="8677040780775113033">"Posizione"</item>
+    <item msgid="1660743989948992916">"Posizione"</item>
+    <item msgid="8791172739860195290">"Vibrazione"</item>
+    <item msgid="383413555642128046">"Lettura contatti"</item>
+    <item msgid="3654594895269697313">"Modifica dei contatti"</item>
+    <item msgid="7928393476362362538">"Lettura del registro chiamate"</item>
+    <item msgid="6248591205254641116">"Modifica del registro chiamate"</item>
+    <item msgid="6093344633066170692">"Lettura calendario"</item>
+    <item msgid="1334886368750347692">"Modifica del calendario"</item>
+    <item msgid="1638204101698708656">"Posizione"</item>
+    <item msgid="2154671955760380322">"Pubblicazione notifica"</item>
+    <item msgid="4282477730595931828">"Posizione"</item>
+    <item msgid="4891423912898525905">"Chiamate telefono"</item>
+    <item msgid="626463821668200388">"Ricezione SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Invio SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Ricezione SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Ricezione SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Ricezione SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Ricezione SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Invio SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Ricezione SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Invio SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifica delle impostazioni"</item>
+    <item msgid="736541391767350377">"Traccia in alto"</item>
+    <item msgid="5530815681721654194">"Accesso a notifiche"</item>
+    <item msgid="781213371706962767">"Fotocamera"</item>
+    <item msgid="1720492593061838172">"Registrazione audio"</item>
+    <item msgid="3493046322001257041">"Riproduzione audio"</item>
+    <item msgid="136815868796597058">"Lettura degli appunti"</item>
+    <item msgid="5238692940326972503">"Modifica degli appunti"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Breve"</item>
     <item msgid="2560532955514699713">"Medio"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafica)"</item>
     <item msgid="1340692776955662664">"Stack di chiamate su glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Off"</item>
+    <item msgid="675719912558941285">"Area ritaglio non rettangolare blu"</item>
+    <item msgid="1064373276095698656">"Evidenzia cmd disegno test in verde"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Non attivo"</item>
+    <item msgid="2751513398307949636">"Su schermo sotto forma di barre"</item>
+    <item msgid="8272260411216018353">"Su schermo sotto forma di linee"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite standard"</item>
     <item msgid="4071574792028999443">"Nessun processo in background"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 408abbe..9d83982 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -249,7 +249,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"Ricerca di media nella scheda SD..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"Archivio USB montato: lettura."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"La scheda SD montata è di sola lettura."</string>
-    <string name="skip_label" msgid="47510779345218297">"Salta"</string>
+    <string name="skip_label" msgid="47510779345218297">"Ignora"</string>
     <string name="next_label" msgid="4693520878012668114">"Avanti"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"Lingua"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Scegli attività"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Modalità aereo"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Altro..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless e reti"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Gestisci Wi-Fi, Bluetooth, modalità aereo, reti mobili e VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gestisci Wi‑Fi, Bluetooth, modalità aereo, reti mobili e VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming dati"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Connessione a servizi di dati in roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Connessione a servizi di dati in roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digita testo da visualizzare su blocco schermo"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info utente in schermata blocco"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Dati utente"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostra info profilo in schermata di blocco"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informazioni profilo"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Accesso alla posizione"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sicurezza"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Amministrazione dispositivo"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Amministratori dispositivo"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visualizza o disattiva amministratori dispositivo"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nessun listener di notifica installato."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Attivare <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, le quali 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Attiva Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ricorda impostazioni"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Visualizzazione wireless"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Per visualizzare i dispositivi, attiva la visualizzazione wireless."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"La visualizzazione wireless non è attiva perché il Wi-Fi non è attivo."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"La visualizzazione wireless non è attiva perché il Wi‑Fi non è attivo."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Cerca schermi"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Ricerca in corso…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nessuno schermo wireless vicino trovato."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Quando questa funzione è attiva, puoi trasferire contenuti di applicazioni su un altro dispositivo che supporta la tecnologia NFC tenendo vicini i due dispositivi. Puoi trasferire, ad esempio, pagine dell\'applicazione Browser, video di YouTube, contatti di Persone e altri dati."\n\n"È sufficiente avvicinare i dispositivi (generalmente mettendo a contatto le due parti posteriori), quindi toccare lo schermo. L\'applicazione stabilisce i dati da trasferire."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Rilevamento servizi di rete"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Consenti alle applicazioni su altri dispositivi di scoprire applicazioni su questo dispositivo"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Attiva Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Impostazioni Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Attiva Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Impostazioni Wi‑Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configura e gestisci punti di accesso wireless"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Seleziona Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Attivazione Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Disattivazione Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Seleziona Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Attivazione Wi‑Fi…"</string>
+    <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="3038290727701553612">"Avvisa quando è disponibile una rete aperta"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evita connessioni deboli"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Non utilizzare una rete Wi-Fi a meno che non abbia una buona connessione a Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Mantieni Wi-Fi durante sospensione"</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_scan_always_available" msgid="3470564139944368030">"Scansione sempre disponibile"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Installa certificati"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Per una maggiore precisione nella localizzazione e altri motivi, Google e altre app sono in grado di cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Avanzate &gt; Scansione sempre disponibile."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Le app possono cercare reti nelle vicinanze, anche quando la connessione Wi-Fi è disattivata. Se non desideri consentire tale ricerca, accedi ad Advanzate &gt; Scansione sempre disponibile."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Non·mostrare·più"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Tieni attivo Wi‑Fi durante sospensione"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Si è verificato un problema durante la modifica dell\'impostazione"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Ottimizzazione Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Riduci al minimo l\'utilizzo della batteria quando Wi-Fi è attivo"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Ottimizzazione Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Riduci al minimo l\'utilizzo della batteria quando Wi‑Fi è attivo"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Aggiungi rete"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Reti Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Reti Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pulsante di comando WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Altre opzioni"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Inserimento PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Per conoscere le reti disponibili, attiva il Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Ricerca reti Wi-Fi in corso…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Per visualizzare le reti disponibili, attiva Wi‑Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ricerca reti Wi‑Fi in corso…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Non disponi dell\'autorizzazione per cambiare la rete Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Altra rete…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Altro"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configurazione auto (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Per poter completare la configurazione, il tablet deve poter accedere a una rete Wi-Fi. Dopo la configurazione potrai passare dalla rete di dati mobili alla rete Wi-Fi e viceversa."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Per poter completare la configurazione, il tablet deve poter accedere a una rete Wi‑Fi. Dopo la configurazione potrai passare dalla rete di dati mobili alla rete Wi‑Fi e viceversa."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostra opzioni avanzate"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Impostazione protetta Wi-Fi"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Connesso alla rete Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"La configurazione WPS è già in corso e il completamento può richiedere fino a due minuti"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Configurazione WPS non riuscita. Riprova tra qualche minuto."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"L\'impostazione di sicurezza del router wireless (WEP) non è supportata"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Errore di autenticazione. Riprova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"È stata rilevata un\'altra sessione WPS. Riprova tra qualche minuto."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rete"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Inserisci l\'SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sicurezza"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensità segnale"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stato"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Consetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rifiuta"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Connetti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Impossibile connettersi alla rete"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Elimina"</string>
@@ -608,16 +630,16 @@
     <string name="wifi_save" msgid="3331121567988522826">"Salva"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Impossibile salvare la rete"</string>
     <string name="wifi_cancel" msgid="6763568902542968964">"Annulla"</string>
-    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Salta comunque"</string>
+    <string name="wifi_skip_anyway" msgid="6965361454438011190">"Ignora comunque"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Non saltare"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati."\n\n"La configurazione del tablet può richiedere notevole attività di rete."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVVISO. Potresti incorrere in addebiti extra dell\'operatore per i dati."\n\n"La configurazione del telefono può richiedere notevole attività di rete."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVVISO. Sul tablet non sarà possibile verificare se il software è aggiornato."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVVISO. Sul telefono non sarà possibile verificare se il software è aggiornato."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Impossibile collegare il tablet alla rete Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Impossibile collegare il telefono alla rete Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avanzate"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda di frequenza Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVVISO. Finché non disporrai di una connessione Internet, il tablet non sarà in grado di verificare che il software sia aggiornato."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVVISO. Finché non disporrai di una connessione Internet, il telefono non sarà in grado di verificare che il software sia aggiornato."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Impossibile collegare il tablet alla rete Wi‑Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Impossibile collegare il telefono alla rete Wi‑Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi avanzate"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda di frequenza Wi‑Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Specifica campo di frequenza di funzionamento"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Errore di impostazione della banda di frequenza."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Indirizzo MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lunghezza prefisso rete"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informazioni dispositivo"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Memorizza questa connessione"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cerca dispositivi"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annullare l\'invito?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vuoi annullare l\'invito a connettersi con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminare questo gruppo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi‑Fi portatile"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Attivazione hotspot..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Disattivazione hotspot..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portatile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> attivo"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errore hotspot Wi-Fi portatile"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configura hotspot Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"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_failed_subtext" msgid="1484941858530919002">"Errore hotspot Wi‑Fi portatile"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configura hotspot Wi‑Fi"</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="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensità segnale"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Rete"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Indirizzo MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Indirizzo MAC Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Indirizzo Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numero di serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Non disponibile"</string>
@@ -803,7 +825,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponibile (in sola lettura)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spazio totale"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Calcolo..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Applicazioni (dati di app e contenuti multimediali)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"App (dati di app e contenuti multimediali)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Supporti"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Download"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Foto, video"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN attivo"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN non attivo"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valore MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Elimina APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nuovo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salva"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Guida"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reti mobili"</string>
     <string name="location_title" msgid="1029961368397484576">"La mia posizione"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Posizione Wi-Fi e rete mobile"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Posizione Wi‑Fi e rete mobile"</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="7457348712272184793">"Posizione determinata da Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posizione determinata da Wi‑Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelliti GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Consenti alle applicazioni di utilizzare il GPS del tablet per individuare la tua posizione"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Consenti alle applicazioni di utilizzare il GPS del telefono per individuare la tua posizione"</string>
@@ -968,7 +992,7 @@
     <string name="use_location_summary" msgid="3978805802386162520">"Consenti a Google di usare la tua posizione per migliorare i risultati di ricerca e altri servizi"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Accesso alla mia posizione"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Consenti alle applicazioni che hanno chiesto la tua autorizzazione di utilizzare le informazioni sulla tua posizione"</string>
-    <string name="location_sources_heading" msgid="1278732419851088319">"Fonti di localizzazione"</string>
+    <string name="location_sources_heading" msgid="1278732419851088319">"Fonti di geolocalizzazione"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Informazioni sul tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Info sul telefono"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Visualizza informazioni legali, stato, versione del software"</string>
@@ -1018,7 +1042,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Devi inserire la sequenza per sbloccare lo schermo"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Rendi visibile la sequenza"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Vibra alla pressione"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Blocco con pulsante accens."</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Blocco con tasto accensione"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Imposta sequenza"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Cambia sequenza di sblocco"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Procedura per l\'impostazione di una sequenza di sblocco"</string>
@@ -1027,14 +1051,14 @@
     <string name="activity_not_found" msgid="5551664692991605325">"Applicazione non installata sul telefono."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gestisci applicazioni"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gestisci e rimuovi applicazioni installate"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"Applicazioni"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"App"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gestisci le applicazioni, imposta le scorciatoie di avvio rapido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Impostazioni applicazioni"</string>
     <string name="install_applications" msgid="4872012136210802181">"Origini sconosciute"</string>
     <string name="install_unknown_applications" msgid="176855644862942064">"Consenti l\'installazione di applicazioni da fonti sconosciute"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Il tablet e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al tablet o della perdita di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Il telefono e i dati personali sono più vulnerabili agli attacchi da parte di applicazioni di origini sconosciute. L\'utente accetta di essere il solo responsabile degli eventuali danni al telefono o della perdita di dati che potrebbero derivare dall\'utilizzo di queste applicazioni."</string>
-    <string name="verify_applications" msgid="2959359554974828518">"Verifica applicazioni"</string>
+    <string name="verify_applications" msgid="2959359554974828518">"Verifica app"</string>
     <string name="verify_applications_summary" msgid="6737505521913263792">"Non consentire o avvisa prima dell\'installazione di applicazioni che potrebbero causare danni"</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Impostazioni avanzate"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Attiva altre impostazioni"</string>
@@ -1076,12 +1100,13 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Mostra processi nella cache"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Reimposta preferenze app"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Reimpostare preferenze app?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"L\'operazione consentirà di reimpostare tutte le preferenze per:"\n\n" "<li>"Applicazioni disattivate"</li>\n" "<li>"Notifiche di applicazioni disattivate"</li>\n" "<li>"Applicazioni predefinite per azioni"</li>\n" "<li>"Limitazioni sui dati in background per le applicazioni"</li>\n\n" I dati delle applicazioni non andranno persi."</string>
-    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reimposta applicazioni"</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"L\'operazione consentirà di reimpostare tutte le preferenze per:"\n\n" "<li>"App disattivate"</li>\n" "<li>"Notifiche di app disattivate"</li>\n" "<li>"App predefinite per determinate azioni"</li>\n" "<li>"Limitazioni sui dati in background per le app"</li>\n\n" I dati delle app non andranno persi."</string>
+    <string name="reset_app_preferences_button" msgid="2559089511841281242">"Reimposta app"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Gestisci spazio"</string>
     <string name="filter" msgid="2018011724373033887">"Filtra"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Scegli opzioni di filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tutte"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Disattivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Scaricate"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"In uso"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Archivio USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Se disattivi un\'applicazione incorporata, altre applicazioni potrebbero funzionare in modo anomalo. Verranno inoltre eliminati i tuoi dati."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Disattivare le notifiche?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se disattivi le notifiche per questa applicazione potresti perdere avvisi e aggiornamenti importanti."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Op. app"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"In corso"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Mai utilizzata)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizzo memoria"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualizza la memoria utilizzata dalle applicazioni"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Parola:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Scorciatoia:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Lingua:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Digita una parola"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Collegamento facoltativo"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifica parola"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifica"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Elimina"</string>
@@ -1239,7 +1269,7 @@
     <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">"Applicazioni"</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>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Impostazioni tastiera fisica"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opzioni sviluppatore"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Imposta opzioni per lo sviluppo di applicazioni"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Le opzioni sviluppatore non sono disponibili per questo utente"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debug USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modalità debug quando è connesso USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autorizzazioni debug USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Segnalazioni di bug nel menu di accensione"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includi opzione per aprire una segnalazione bug nel menu di accensione"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Rimani attivo"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Consentire impostazioni di sviluppo?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Queste impostazioni sono utilizzabili solo a scopo di sviluppo. Possono causare l\'arresto o il comportamento anomalo del dispositivo e delle applicazioni su di esso."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifica app tramite USB"</string>
@@ -1301,36 +1334,31 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Impostazioni di accessibilità"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"Servizi"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Sistema"</string>
-    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesti ingrandimento"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Gesti di ingrandimento"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Quando questa funzione è attiva puoi aumentare e diminuire lo zoom toccando tre volte lo schermo."\n\n"Dopo avere aumentato lo zoom puoi:"\n<ul><li>"Eseguire una panoramica: trascina due o più dita sullo schermo."</li>\n<li>"Regolare il livello di zoom: unisci due o più dita come per fare un pizzicotto o allontanale."</li></ul>\n\n"Puoi anche ingrandire temporaneamente l\'area su cui hai il dito toccando tre volte e tenendo premuto. Nello stato ingrandito puoi trascinare il dito per esaminare parti diverse dello schermo. Solleva il dito per tornare allo stato precedente."\n\n"Nota. Il tocco triplo per ingrandire funziona ovunque tranne che per la tastiera e la barra di navigazione."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Collegamento Accessibilità"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Attiva"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Disattivato"</string>
-    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando questa funzione è attiva, puoi attivare rapidamente le funzioni di accessibilità in due passaggi:"\n\n"Passaggio 1. Premi e tieni premuto il pulsante di accensione fino all\'emissione di un suono o una vibrazione."\n\n"Passaggio 2. Tocca con due dita e tieni premuto finché senti un suono di conferma."\n\n"Se sul dispositivo sono configurati più utenti e utilizzi questa scorciatoia nella schermata di blocco, l\'accessibilità viene attivata temporaneamente fino allo sblocco del dispositivo."</string>
+    <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Quando questa funzione è attiva, puoi attivare rapidamente le funzioni di accessibilità in due passaggi:"\n\n"Passaggio 1. Premi e tieni premuto il tasto di accensione fino all\'emissione di un suono o una vibrazione."\n\n"Passaggio 2. Tocca con due dita e tieni premuto finché senti un suono di conferma."\n\n"Se sul dispositivo sono configurati più utenti e utilizzi questa scorciatoia nella schermata di blocco, l\'accessibilità viene attivata temporaneamente fino allo sblocco del dispositivo."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Testo grande"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ingrandimento schermo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Aggiorn. autom. ingrandim. schermo"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aggiorna ingrandimento schermo per transizioni app"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Chiudi chiamata con pulsante ON/OFF"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Chiudi chiamata da ON/OFF"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Pronuncia le password"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Ritardo tocco e pressione"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Migliora l\'accessibilità web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Impostazioni"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Attiva"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Non attiva"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Ammesso"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Non consentito"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Consenti"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Non consentire"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Utilizzare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> è in grado di raccogliere tutto il testo digitato, tranne le password. Sono inclusi i dati personali come i numeri di carte di credito. Può anche raccogliere dati sulle tue interazioni con il tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> è in grado di raccogliere tutto il testo digitato, tranne le password. Sono inclusi i dati personali come i numeri di carte di credito. Può anche raccogliere dati sulle tue interazioni con il telefono."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Interrompere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Se tocchi OK <xliff:g id="SERVICE">%1$s</xliff:g> verrà interrotto."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Osservare le tue azioni"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Ricevere notifiche quando interagisci con un\'app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Interrompere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Se tocchi OK <xliff:g id="SERVICE">%1$s</xliff:g> verrà interrotto."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nessun servizio installato"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Hai bisogno di uno screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack fornisce commenti vocali per utenti non vedenti o con problemi di vista. Vuoi installare gratuitamente l\'applicazione da Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vuoi che le applicazioni installino script di Google per rendere più accessibili i relativi contenuti web?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nessuna descrizione fornita."</string>
     <string name="settings_button" msgid="3006713718908152930">"Impostazioni"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteria"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"In carica"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Schermo acceso"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS attivo"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Attivo"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Segnale rete mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo accensione Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo accensione Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Tempo accensione Wi‑Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo accensione Wi‑Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Dettagli cronologia"</string>
     <string name="details_title" msgid="3792801565213935385">"Dettagli di utilizzo"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Regola consumo alimentazione"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacchetti inclusi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Schermo"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Cellulare in standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chiamate vocali"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU in primo piano"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Mantieni attivo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi attivo"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi‑Fi attivo"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dati inviati"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informazioni applicazione"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Impostazioni applicazioni"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Impostazioni schermo"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Impostazioni Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Impostazioni Wi‑Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Impostazioni Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteria utilizzata da chiamate vocali"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Utilizzo batteria quando il tablet è inattivo"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Passa a modalità in volo per ridurre i consumi nelle aree senza copertura cellulare"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteria utilizzata da display e retroilluminazione"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Riduci la luminosità e/o il timeout dello schermo"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteria utilizzata da Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Disattiva Wi-Fi quando non è in uso o non è disponibile"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batteria utilizzata da Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Disattiva Wi‑Fi quando non è in uso o non è disponibile"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batteria utilizzata da Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Disattiva Bluetooth quando non è in uso"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Prova a connetterti a un altro dispositivo Bluetooth"</string>
@@ -1408,7 +1436,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"MediaServer"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Impostazioni vocali"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Impostazioni vocali in entrata e uscita"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Impostazioni input e output vocale"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ricerca vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastiera Android"</string>
     <string name="voice_category" msgid="1430370497125803904">"Voce"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configura"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Scegli un altro motore"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Questo motore di sintesi vocale potrebbe essere in grado di raccogliere tutto il testo pronunciato, inclusi dati personali come password e numeri di carte di credito. Deriva dal motore <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Abilitare l\'uso di questo motore di sintesi vocale?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Questa lingua richiede una connessione di rete funzionante per l\'output di sintesi vocale."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motori"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Impostazioni di <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> è abilitato"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motore preferito"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Generali"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controllo risparmio energia"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aggiornamento impostazione Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Aggiornamento impostazione Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aggiornamento impostazione Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"attivo"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"non attivo"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"attivazione"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"disattivazione"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizzazione"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Rimuovi tutti i certificati"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenziali attendibili"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visualizza certificati CA attendibili"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tipo di archivio"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Basato sull\'hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Inserisci la sequenza di sblocco"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Backup e ripristino"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dati personali"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Backup dei miei dati"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Effettua il backup di dati delle applicazioni, password Wi-Fi e altre impostazioni sui server di Google"</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="auto_restore_title" msgid="5397528966329126506">"Ripristino automatico"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Le password inserite non corrispondono"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Impossibile impostare la password di backup"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Interrompere il backup delle password Wi-Fi, dei segnalibri, di altre impostazioni e dei dati delle applicazioni, oltre a cancellare tutte le copie sui server di Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Interrompere il backup delle password Wi‑Fi, dei segnalibri, di altre impostazioni e dei dati delle app, oltre a cancellare tutte le copie sui server di Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Impostazioni di amministrazione dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Amministratore dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Disattiva"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notifiche"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Suoneria e vibrazione chiamata"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Impostazione Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Connetti alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Connessione alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Impostazione Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Connetti alla rete Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Connessione alla rete Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Connesso alla rete Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Aggiungi una rete"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Non connesso"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Aggiungi rete"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Connessione..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Vai al passaggio successivo"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP non è supportato."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Impossibile configurare una connessione Wi-Fi EAP durante l\'impostazione. Dopo l\'impostazione potrai configurarla nella sezione Impostazioni &gt; Wireless e reti."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Impossibile configurare una connessione Wi‑Fi EAP durante l\'impostazione. Dopo l\'impostazione potrai configurarla nella sezione Impostazioni &gt; Wireless e reti."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"La connessione può richiedere qualche minuto..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione."\n\n"Tocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione."\n\n"Tocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizzazione abilitata"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizzazione disabilata"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Errore di sincronizzazione."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"L\'app. in debug attende il debugger prima dell\'esecuzione"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Disegno"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Rendering con accelerazione hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoraggio"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Attiva StrictMode"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Flash dello schermo in caso di lunghe operazioni sul thread principale"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Dal migliore al peggiore: blu, verde, rosso chiaro, rosso"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Disabilita overlay HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Abilita tracce"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Seleziona tracce abilitate"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Nessuna traccia attualmente abilitata"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> tracce attualmente abilitate"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tutte le tracce attualmente abilitate"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Attiva tracce OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostra limiti di layout"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostra limiti, margini dei clip e così via"</string>
@@ -1656,24 +1684,26 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forza l\'uso della GPU per i disegni 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forza MSAA 4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Attiva MSAA 4x in applicazioni OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Debug operazioni ritaglio non rettangolare"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Rendering GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Misura tempi rendering in adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scala animazione finestra"</string>
     <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="debug_applications_category" msgid="4206913653849771549">"Applicazioni"</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>
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite processi background"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostra tutti errori ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostra finestra ANR per applicazioni in background"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Usa WebView sperimentale"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Le app utilizzeranno la WebView più recente (Beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilizzo dati"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo utilizzo dati"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming dei dati"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Limita dati in background"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separa utilizzo 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostra utilizzo Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Mostra utilizzo Wi‑Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostra utilizzo Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Hotspot mobili"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizzazione automatica dei dati"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Imposta limite dati mobili"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Imposta limite dati 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Imposta limite dati 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Imposta limite dati Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Imposta limite dati Wi‑Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobili"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo tablet e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"La tua connessione dati mobili verrà disattivata al raggiungimento del limite specificato."\n\n"Dato che l\'utilizzo dei dati è misurato dal tuo telefono e che il tuo operatore potrebbe tenere conto dell\'utilizzo in modo diverso, è consigliabile utilizzare un limite conservativo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Limitare i dati in background?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se limiti i dati mobili in background, alcuni servizi e applicazioni potrebbero non funzionare senza connessione a una rete Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Se limiti i dati mobili in background, alcuni servizi e applicazioni non funzioneranno a meno che tu non sia connesso a una rete Wi-Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Se limiti i dati mobili in background, alcuni servizi e applicazioni non funzioneranno a meno che tu non sia connesso a una rete Wi-Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."\n\n"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applicazioni rimosse"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: utilizzati quasi <xliff:g id="TOTAL">%1$s</xliff:g>, misurati dal tablet. I dati possono differire da quelli dell\'operatore."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: utilizzati quasi <xliff:g id="TOTAL">%1$s</xliff:g>, misurati dal tel. I dati possono differire da quelli dell\'operatore."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspot mobili"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Seleziona le reti Wi-Fi che che sono hotspot mobili. Alle applicazioni può essere impedito l\'uso di queste reti quando in background. Le applicazioni potrebbero inoltre avvisarti prima che utilizzi queste reti per download di grandi dimensioni."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Seleziona le reti Wi‑Fi che sono hotspot mobili. Alle app può essere impedito l\'uso di queste reti quando in background. Le app potrebbero inoltre avvisarti prima che utilizzi queste reti per download di grandi dimensioni."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reti mobili"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Reti Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Per selezionare hotspot mobili, attiva il Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Reti Wi‑Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Per selezionare hotspot mobili, attiva il Wi‑Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chiamata di emergenza"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Torna a chiamata"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Applicazione"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utenti"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Tu"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Altri utenti"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Aggiungi utente"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Attivo"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Non attivo"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Utenti e profili"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Aggiungi utente o profilo"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profilo con limitazioni"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Prima di poter creare un profilo con limitazioni, devi impostare un blocco schermo per proteggere le tue app e i tuoi dati personali."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Imposta blocco"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Non configurato"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Non impostato - Profilo con limitazioni"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietario"</string>
+    <string name="user_you" msgid="1639158809315025986">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nickname"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Aggiungi"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gli utenti hanno applicazioni e contenuti personali"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Puoi limitare l\'accesso alle applicazioni e ai contenuti dal tuo account"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Utente"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profilo con limitazioni"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Aggiungi nuovo utente"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puoi condividere il dispositivo con altri utenti creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con applicazioni, sfondo e così via. Gli utenti possono anche regolare le impostazioni del tablet, come il Wi-Fi, che riguardano tutti."\n\n"Dopo la creazione di un nuovo utente, quella persona deve eseguire una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle applicazioni aggiornate per conto di tutti gli altri utenti."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puoi condividere il dispositivo con altre persone creando altri utenti. Ogni utente ha un proprio spazio personalizzabile con app, sfondo e così via. Gli utenti possono anche regolare le impostazioni del tablet, come il Wi‑Fi, che riguardano tutti."\n\n"Dopo la creazione di un nuovo utente, la persona in questione deve svolgere una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle app aggiornate per conto di tutti gli altri utenti."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Dopo la creazione di un nuovo utente, quella persona deve eseguire una procedura di configurazione."\n\n"Qualsiasi utente può accettare le autorizzazioni delle applicazioni aggiornate per conto di tutti gli altri utenti."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurare l\'utente ora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Assicurati che la persona possa utilizzare il tablet e configurare il suo spazio."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurare il profilo ora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configura ora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Non ora"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Solo il proprietario del tablet può gestire gli utenti."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Solo il proprietario del telefono può gestire gli utenti."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"I profili con limitazioni non possono aggiungere account"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Elimina <xliff:g id="USER_NAME">%1$s</xliff:g> da dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuovo utente"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nuovo profilo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminare te stesso?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Rimuovere l\'utente?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Rimuovere il profilo?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderai il tuo spazio e i tuoi dati sul tablet. Non è possibile annullare l\'azione."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderai il tuo spazio e i tuoi dati sul telefono. Non è possibile annullare l\'azione."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Lo spazio e i dati dell\'utente scompariranno dal tablet. Non è possibile annullare l\'azione."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Lo spazio e i dati dell\'utente scompariranno dal telefono. Non è possibile annullare l\'azione."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Lo spazio e i dati del profilo scompariranno dal tablet. Non è possibile annullare l\'azione."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Lo spazio e i dati del profilo scompariranno dal telefono. Non è possibile annullare l\'azione."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Aggiunta nuovo utente…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Elimina utente"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Elimina"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Questa impostazione influisce su tutti gli utenti di questo tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Questa impostazione influisce su tutti gli utenti di questo telefono."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Cambia lingua"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcast"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Seleziona i tipi di avvisi di emergenza da visualizzare."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Limitazioni per app e contenuti"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RINOMINA"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Imposta limiti applicazione"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Consenti la modifica di impostazioni e accoppiamenti Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Consenti lo scambio di dati quando il tablet tocca un altro dispositivo"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Consenti lo scambio di dati quando il telefono tocca un altro dispositivo"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Accesso alla posizione"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Consenti alle app di utilizzare informazioni sulla tua posizione"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Indietro"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Avanti"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Fine"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Scatta foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Scegli la foto dalla Galleria"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 8a9f26f..63566bb 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"איטי"</item>
     <item msgid="1145554631248513562">"רגיל"</item>
     <item msgid="7553665153391107454">"מהיר"</item>
-    <item msgid="2538100882620724753">"מהיר מאוד"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"ללא"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"אין"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"לא צוין"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"ללא"</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">"אחסון פנימי במכשיר"</item>
     <item msgid="3738430123799803530">"כרטיס SD נשלף"</item>
     <item msgid="4498124044785815005">"תן למערכת להחליט"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"מיקום"</item>
+    <item msgid="255608127647030286">"אישי"</item>
+    <item msgid="4588829735729884491">"העברת הודעות"</item>
+    <item msgid="8971765125227378270">"מכשיר"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"מיקום משוער"</item>
+    <item msgid="5789673140227507995">"מיקום מדויק"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"רטט"</item>
+    <item msgid="3434165993711230924">"קרא אנשי קשר"</item>
+    <item msgid="616161687718081936">"שנה אנשי קשר"</item>
+    <item msgid="7638002295329050091">"קרא יומן שיחות"</item>
+    <item msgid="6546959730920410907">"שנה יומן שיחות"</item>
+    <item msgid="446877710771379667">"קרא יומן"</item>
+    <item msgid="7674458294386319722">"שנה לוח שנה"</item>
+    <item msgid="8281201165558093009">"סריקת wi-fi"</item>
+    <item msgid="8694611243479480497">"התראה"</item>
+    <item msgid="7776439107987345446">"סריקה סלולרית"</item>
+    <item msgid="514615766544675057">"שיחת טלפון"</item>
+    <item msgid="8181415497109310680">"קרא SMS"</item>
+    <item msgid="6816551144382117307">"כתוב SMS"</item>
+    <item msgid="4600463921908905030">"קבל SMS"</item>
+    <item msgid="5958926493289432745">"קבל SMS חירום"</item>
+    <item msgid="4945269495221089540">"קבל MMS"</item>
+    <item msgid="5570472453573929087">"קבל WAP בדחיפה"</item>
+    <item msgid="7125408150230860501">"שלח SMS"</item>
+    <item msgid="7080337936612188061">"קרא ICC SMS"</item>
+    <item msgid="587124103118495063">"כתוב ICC SMS"</item>
+    <item msgid="2320577158869025503">"שנה הגדרות"</item>
+    <item msgid="1545733463471924009">"צייר מעל"</item>
+    <item msgid="3609046903962454582">"גש אל ההתראות"</item>
+    <item msgid="4671646036128214513">"מצלמה"</item>
+    <item msgid="1097324338692486211">"הקלט אודיו"</item>
+    <item msgid="5031552983987798163">"הפעל את האודיו"</item>
+    <item msgid="8374996688066472414">"קרא לוח"</item>
+    <item msgid="3045529469061083747">"שנה לוח"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"מיקום"</item>
+    <item msgid="8677040780775113033">"מיקום"</item>
+    <item msgid="1660743989948992916">"מיקום"</item>
+    <item msgid="8791172739860195290">"רטט"</item>
+    <item msgid="383413555642128046">"קרא אנשי קשר"</item>
+    <item msgid="3654594895269697313">"שנה אנשי קשר"</item>
+    <item msgid="7928393476362362538">"קרא יומן שיחות"</item>
+    <item msgid="6248591205254641116">"שנה יומן שיחות"</item>
+    <item msgid="6093344633066170692">"קרא יומן"</item>
+    <item msgid="1334886368750347692">"שנה לוח שנה"</item>
+    <item msgid="1638204101698708656">"מיקום"</item>
+    <item msgid="2154671955760380322">"פרסם התראה"</item>
+    <item msgid="4282477730595931828">"מיקום"</item>
+    <item msgid="4891423912898525905">"שיחת טלפון"</item>
+    <item msgid="626463821668200388">"קבל SMS/MMS"</item>
+    <item msgid="1237538540368797101">"שלח SMS/MMS"</item>
+    <item msgid="3986142739951490025">"קבל SMS/MMS"</item>
+    <item msgid="3984213795861739778">"קבל SMS/MMS"</item>
+    <item msgid="3656243523752472788">"קבל SMS/MMS"</item>
+    <item msgid="8105802370238551510">"קבל SMS/MMS"</item>
+    <item msgid="1407766984645388488">"שלח SMS/MMS"</item>
+    <item msgid="1530132603376027248">"קבל SMS/MMS"</item>
+    <item msgid="1188256962149204607">"שלח SMS/MMS"</item>
+    <item msgid="4218544235221631789">"שנה הגדרות"</item>
+    <item msgid="736541391767350377">"צייר מעל"</item>
+    <item msgid="5530815681721654194">"גש אל ההתראות"</item>
+    <item msgid="781213371706962767">"מצלמה"</item>
+    <item msgid="1720492593061838172">"הקלט אודיו"</item>
+    <item msgid="3493046322001257041">"הפעל את האודיו"</item>
+    <item msgid="136815868796597058">"קרא לוח"</item>
+    <item msgid="5238692940326972503">"שנה לוח"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"קצר"</item>
     <item msgid="2560532955514699713">"בינוני"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (גרפיקה)"</item>
     <item msgid="1340692776955662664">"Call Stack ב-glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"במסך כעמודות"</item>
+    <item msgid="8272260411216018353">"במסך כקווים"</item>
+    <item msgid="120512413928262547">"ב-adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"הגבלת תקן"</item>
     <item msgid="4071574792028999443">"אין תהליכים ברקע"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 5770106..b0894de 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"מצב טיסה"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"עוד..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"אלחוטי ורשתות"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"ניהול Wi-Fi, ‏Bluetooth, מצב טיסה, רשתות סלולריות ורשתות VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"ניהול Wi-Fi, ‏Bluetooth, מצב טיסה, רשתות סלולריות ורשתות VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"נדידת נתונים"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"התחבר לשירותי נתונים בנדידה"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"התחבר לשירותי נתונים בנדידה"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"הקלד טקסט להצגה בנעילת המסך"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"הצג פרטי משתמש במסך הנעילה"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"פרטי משתמש"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"הצג פרטי פרופיל במסך הנעילה"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"פרטי פרופיל"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"גישה למיקום"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"אבטחה"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
@@ -351,7 +353,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"הסט"</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_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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"ניהול מכשירים"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"מנהלי התקנים"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"הצג או השבת מנהלי התקנים"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"גישה אל התראות"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"הפעל את Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"זכור הגדרות"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"צג אלחוטי"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"כדי לראות מכשירים, הפעל את הצג האלחוטי."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"הצג האלחוטי מושבת משום ש-Wi-Fi כבוי."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"הצג האלחוטי מושבת מפני שה-Wi-Fi כבוי."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"חפש צגים"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"מחפש…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"לא נמצאו צגים אלחוטיים קרובים."</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"הפעל Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"הגדרות Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"הפעל את ה-Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"הגדרות Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"הגדר ונהל נקודות גישה אלחוטיות"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"בחר Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"מפעיל Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"מכבה את Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"בחר Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"מפעיל את ה-Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"מכבה את ה-Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"שגיאה"</string>
     <string name="wifi_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="3038290727701553612">"שלח לי התראה כשיש רשת פתוחה זמינה"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"הימנע מחיבורים באיכות ירודה"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט טוב"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"השאר Wi-Fi פעיל במהלך שינה"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"אל תשתמש ברשת Wi-Fi, אלא אם יש לה חיבור אינטרנט באיכות טובה"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"סריקה זמינה תמיד"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"תן לשירות המיקום של Google וליישומים אחרים לסרוק על מנת למצוא רשתות, גם כש-Wi-Fi כבוי."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"התקן אישורים"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"כדי לשפר את מידת הדיוק מבחינת מיקום ולהשגת יתרונות נוספים, יישומים של Google ויישומים נוספים עשויים לבצע סריקה לאיתור רשתות קרובות, גם כאשר ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"יישומים עשויים לבצע סריקה לאיתור רשתות קרובות, גם אם ה-Wi-Fi כבוי. אם אינך מעוניין בכך, עבור אל \'מתקדם\' &gt; \'סריקה זמינה תמיד\'."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"אל תציג שוב"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"השאר את ה-Wi-Fi פועל בזמן שינה"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"אירעה בעיה בשינוי ההגדרה"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"אופטימיזציה ל-Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"צמצם את השימוש בסוללה כאשר Wi-Fi מופעל"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"אופטימיזציה ל-Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"צמצם את השימוש בסוללה כאשר Wi-Fi פועל"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"הוסף רשת"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"רשתות Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"רשתות Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"לחצן WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"אפשרויות נוספות"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"הזנת PIN ‏של WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"‫Wi-Fi ישיר"</string>
+    <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_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"שכח רשת"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"מחפש רשתות Wi-Fi ..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"כדי לראות רשתות זמינות, הפעל את ה-Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"מחפש רשתות Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"אין לך הרשאה לשנות את רשת ה-Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"רשת אחרת..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"עוד"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"התקנה אוטומטית (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"כדי להשלים את ההתקנה, הטאבלט צריך גישה ל-Wi-Fi. לאחר ההתקנה, תוכל לעבור בין רשת נתונים לנייד ובין Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"כדי להשלים את ההתקנה, הטאבלט צריך גישה ל-Wi-Fi. לאחר ההגדרה, תוכל לעבור בין רשת נתונים לנייד ובין Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"הצג אפשרויות מתקדמות"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של Wi-Fi"</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="7204827509934892103">"לחץ על כפתור ה-Wi-Fi Protected Setup בנתב שלך. ייתכן שבמקום שם זה יופיע הכיתוב \"WPS\" או הסמל הזה:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"הזן את מספר ה-PIN <xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. השלמת ההתקנה עשויה להימשך עד שתי דקות."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"לחץ על הכפתור \'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="5754399645462924103">"מחובר לרשת Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"מחובר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"התקנת WPS כבר מתבצעת, והשלמת הפעולה עשויה להימשך עד שתי דקות"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS נכשל. נסה שוב בעוד מספר דקות."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"הגדרת האבטחה של הנתב האלחוטי (WEP) אינה נתמכת"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"האימות נכשל. נסה שוב."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"אותרה פעילות WPS נוספת באתר. נסה שוב בעוד מספר דקות."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"של הרשת SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"הזן את ה-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"אבטחה"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"עוצמת אות"</string>
     <string name="wifi_status" msgid="4824568012414605414">"סטטוס"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"דחה"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"התחבר"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"שכח"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"אל תדלג"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"אזהרה: הספק עלול לגבות עלויות נתונים נוספות."\n\n"הגדרת טאבלט עשויה לצרוך פעילות רבה ברשת."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"אזהרה: הספק עלול לגבות עלויות נתונים נוספות."\n\n"הגדרת טלפון עשויה לצרוך פעילות רבה ברשת."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"אזהרה: הטאבלט לא יוכל לוודא שהתוכנה שלך עדכנית."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"אזהרה: הטלפון לא יוכל לוודא שהתוכנה שלך עדכנית."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"הטאבלט לא הצליח להתחבר לרשת Wi-Fi זו."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"הטלפון לא הצליח להתחבר לרשת Wi-Fi זו."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi מתקדם"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"תדר Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"אזהרה: לפני שיהיה לך חיבור אינטרנט, הטאבלט לא יוכל לאמת שהתוכנה שלך עדכנית."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"אזהרה: לפני שיהיה לך חיבור אינטרנט, הטלפון לא יוכל לאמת שהתוכנה שלך עדכנית."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"הטאבלט לא הצליח להתחבר לרשת ה-Wi-Fi הזו."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"הטלפון לא הצליח להתחבר לרשת ה-Wi-Fi הזו."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi מתקדם"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"טווח תדרי Wi‑Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"ציין את טווח התדר של הפעולה"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"היתה בעיה בהגדרת התדר."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"כתובת MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"שער"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"אורך קידומת של רשת"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"‫Wi-Fi ישיר"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"פרטי מכשיר"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"זכור חיבור זה"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"חיפוש מכשירים"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם אתה רוצה לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"לשכוח קבוצה זו?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"נקודה חמה ניידת של Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"נקודה חמה ניידת של Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"מפעיל נקודה חמה…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"מכבה נקודה חמה…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל של נקודה חמה ניידת"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"שגיאה של נקודה חמה ניידת של Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"הגדר נקודה חמה של Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"נקודת 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_failed_subtext" msgid="1484941858530919002">"שגיאה בנקודה חמה ניידת של Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"הגדר נקודה חמה של Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
@@ -720,14 +742,14 @@
     <string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"טפט"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"בחר טפט מ-"</string>
-    <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"חלום בהקיץ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"בזמן עגינה או בזמן שינה כשמתבצעת טעינה"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"בשני המצבים"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"במהלך טעינה"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"בזמן עגינה"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"כבוי"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את Daydream."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"מתי יש לעבור למצב Daydream"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את חלום בהקיץ."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"מתי יש לעבור למצב של חלום בהקיץ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"התחל כעת"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"עוצמת אות"</string>
     <string name="status_roaming" msgid="2638800467430913403">"נדידה"</string>
     <string name="status_operator" msgid="2274875196954742087">"רשת"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"כתובת MAC של Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"כתובת MAC של Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"כתובת Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"מספר סידורי"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"לא זמין"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN מופעל"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN מושבת"</string>
     <string name="bearer" msgid="594270280031923558">"נושא"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"סוג MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"ערך MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"מחק APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"חדש APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"שמור"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"עזרה"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"רשתות לנייד"</string>
     <string name="location_title" msgid="1029961368397484576">"המיקום שלי"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"מיקום רשת Wi-Fi ורשת לנייד"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"מיקום רשת Wi-Fi ורשת לנייד"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"אפשר ליישומים להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"המיקום נקבע על ידי Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"המיקום נקבע באמצעות Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"לווייני GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"אפשר ליישומים להשתמש ב-GPS בטאבלט שלך כדי לאתר את מיקומך"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"אפשר ליישומים להשתמש ב-GPS בטלפון שלך כדי לאתר את מיקומך"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"סינון"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"בחר אפשרויות סינון"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"הכל"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"מנוטרל"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ההורדה בוצעה"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"פועל"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"אחסון USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"אם תשבית יישום מובנה, ייתכן שיישומים אחרים יתנהגו באופן בעייתי. גם הנתונים שלך יימחקו."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"האם לבטל התראות?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"אם תבטל התראות עבור יישום זה, אתה עלול להחמיץ התראות ועדכונים חשובים."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"פעולות יישום"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"פועל"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(מעולם לא נעשה שימוש)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"שימוש בשטח אחסון"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"הצג את שטח האחסון שנמצא בשימוש על ידי יישומים"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"שירותים פועלים"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"מילה:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"קיצור דרך:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"שפה:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"הקלד מילה"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"קיצור אופציונלי"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ערוך מילה"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ערוך"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"מחק"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"הגדרות מקלדת פיזית"</string>
     <string name="development_settings_title" msgid="215179176067683667">"אפשרויות מפתח"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"הגדרת אפשרויות לפיתוח יישומים"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"אפשרויות מפתח אינן זמינות עבור משתמש זה"</string>
     <string name="enable_adb" msgid="7982306934419797485">"ניקוי באגים ב-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"מצב תיקון באגים כאשר USB מחובר"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"ביטול הרשאות לניקוי באגים ב-USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"דיווחי באגים ב-Power Menu"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"כלול אפשרות ב-Power Menu לביצוע דיווח על באג"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"השאר פועל"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"האם להתיר הגדרות פיתוח?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"הגדרות אלה מיועדות לשימוש בפיתוח בלבד. הן עלולות לגרום למכשיר או ליישומים המותקנים בו לקרוס או לפעול באופן לא תקין."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"אמת יישומים באמצעות USB"</string>
@@ -1301,7 +1334,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"הגדרות נגישות"</string>
     <string name="accessibility_services_title" msgid="2592221829284342237">"שירותים"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"מערכת"</string>
-    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"מחוות הגדלה"</string>
+    <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"תנועות לשינוי גודל"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"כשתכונה זו מופעלת, ניתן להתקרב ולהתרחק באמצעות הקשה משולשת על המסך."\n\n"בזמן שההצגה מוגדלת ניתן:"\n<ul><li>"להזיז לצדדים: גרור שתי אצבעות או יותר לאורך המסך."</li>\n<li>"לשנות את מידת ההגדלה: עשה תנועת צביטה באמצעות שתי אצבעות או הרחק אותן אחת מהשנייה."</li></ul>\n\n"ניתן גם להגדיל באופן זמני את הפריט שמתחת לאצבע על ידי הקשה משולשת והחזקה. במצב הגדלה זה ניתן לגרור את האצבע על מנת להציג כך חלקים שונים במסך. הרם את האצבע כדי לחזור למצב הקודם."\n\n"שים לב: הקשה משולשת להגדלה פועלת בכל מקום מלבד במקלדת ובסרגל הניווט."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"קיצור נגישות"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"פועל"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"לחצן ההפעלה מסיים שיחה"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"אמירת סיסמאות"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"עיכוב של נגיעה והחזקה"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"שיפור נגישות האינטרנט"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"הגדרות"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"פועל"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"כבוי"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"מורשה"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"אסור"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"אפשר"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"אל תאפשר"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"להשתמש ב<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> יכול לאסוף את כל הטקסט שאתה מקליד, למעט סיסמאות. דבר זה כולל נתונים אישיים כגון מספרים של כרטיסי אשראי. כמו כן ניתן לאסוף נתונים על האינטראקציות שלך עם הטבלט."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> יכול לאסוף את כל הטקסט שאתה מקליד, למעט סיסמאות. דבר זה כולל נתונים אישיים כגון מספרים של כרטיסי אשראי. כמו כן ניתן לאסוף נתונים על האינטראקציות שלך עם הטלפון."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"להפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"נגיעה ב\'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"הצג את הפעולות שלך"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"קבל התראות כשאתה מבצע אינטראקציה עם יישום."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"האם לעצור את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"נגיעה ב\'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"אין שירותים מותקנים"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"זקוק לקורא מסך?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack מספק משוב מוקרא בקול רם כדי לעזור למשתמשים עיוורים ולקויי ראייה. האם ברצונך להתקין אותו ללא תשלום מ\'חנות Android\'?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"האם ברצונך שהיישומים יתקינו סקריפטים מ-Google שהופכים את תוכן האינטרנט שלהם לנגיש יותר?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"לא סופק תיאור."</string>
     <string name="settings_button" msgid="3006713718908152930">"הגדרות"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"סוללה"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"טוען"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"מסך מופעל"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS מופעל"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"פעיל"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"אות רשת לנייד"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"זמן פעולה של מכשיר"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi בזמן"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi בזמן"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi בזמן"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi בזמן"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"פרטי היסטוריה"</string>
     <string name="details_title" msgid="3792801565213935385">"פרטי שימוש"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"התאמת צריכת סוללה"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"חבילות כלולות"</string>
     <string name="power_screen" msgid="3023346080675904613">"מסך"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"סלולרי במצב המתנה"</string>
     <string name="power_phone" msgid="5392641106474567277">"שיחות קוליות"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU בחזית"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"שמור במצב פעיל"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi פועל"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi פועל"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"טאבלט"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"טלפון"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"הנתונים נשלחו"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"פרטי יישום"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"הגדרות יישום"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"הגדרות מסך"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"הגדרות Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"הגדרות Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"הגדרות Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"צריכת סוללה של שיחות קוליות"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"שימוש בסוללה כשהטבלט במצב לא פעיל"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"עבור למצב טיסה כדי לחסוך בצריכת הסוללה באזורים שבהם אין כיסוי סלולרי"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"צריכת סוללה של התצוגה והתאורה האחורית"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"הפחת את בהירות המסך ו/או את הזמן הקצוב לתפוגה של המסך"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"צריכת סוללה של Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"כבה Wi-Fi כאשר אינו בשימוש או אינו זמין"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"צריכת סוללה של Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"כבה את ה-Wi-Fi כאשר אינו בשימוש או כשאינו זמין"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"צריכת הסוללה על ידי Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"כבה את Bluetooth כשאינך משתמש בו"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"נסה להתחבר למכשיר Bluetooth אחר"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"הגדר"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"בחר מנוע אחר"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"ייתכן שמנוע סינתזת דיבור זה יכול לאסוף את כל הטקסט המדובר, כולל נתונים אישיים כגון סיסמאות ומספרי כרטיסי אשראי. הוא מגיע מהמנוע <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. להפוך את השימוש במנוע סינתזת דיבור זה לפעיל?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"שפה זו דורשת חיבור רשת פעיל עבור פלט טקסט לדיבור."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"מנועים"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"הגדרות <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> מופעל"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"מנוע מועדף"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"כללי"</string>
     <string name="gadget_title" msgid="5519037532720577836">"בקרת צריכת חשמל"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"מעדכן הגדרת Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"מעדכן את הגדרת ה-Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"מעדכן הגדרת Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"פועל"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"כבוי"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"מפעיל"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"מכבה"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"סנכרון"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"הצג אישורי CA מהימנים"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"סוג אחסון"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"מגובה באמצעות חומרה"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"תוכנה בלבד"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"שרטט את קו ביטול הנעילה"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"גיבוי ושחזור"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"נתונים אישיים"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"גבה את הנתונים שלי"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"גבה נתוני יישומים, סיסמאות Wi-Fi והגדרות אחרות בשרתי Google"</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="auto_restore_title" msgid="5397528966329126506">"שחזור אוטומטי"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"הסיסמה החדשה והאישור אינם תואמים"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"הגדרת סיסמת גיבוי נכשלה"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"להפסיק לגבות את סיסמאות ה-Wi-Fi, הסימניות, הגדרות אחרות ונתוני היישומים שלך ולמחוק את כל העותקים משרתי Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"האם להפסיק לגבות את סיסמאות ה-Wi-Fi, הסימניות, הגדרות אחרות ונתוני היישומים שלך ולמחוק את כל העותקים משרתי Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"הגדרות ניהול מכשיר"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"מנהל מכשיר"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"בטל הפעלה"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"התראות"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"צלצול ורטט שיחה"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"מערכת"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"הגדרת Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"התחבר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"מתחבר לרשת Wi-Fi‏ <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"מחובר לרשת Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"הגדרת Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"התחבר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"מתחבר לרשת Wi-Fi‏ <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"מחובר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"הוסף רשת"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"לא מחובר"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"הוסף רשת"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"מתחבר…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"עבור לשלב הבא"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"אין תמיכה ב-EAP."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"אין אפשרות להגדיר חיבור Wi-Fi של EAP במהלך ההגדרה. לאחר ההגדרה, תוכל לעשות זאת דךר \'הגדרות\' &gt; \'אלחוטי ורשתות\'."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"אין אפשרות להגדיר חיבור Wi-Fi של EAP במהלך ההגדרה. לאחר ההגדרה, תוכל לעשות זאת ב\'הגדרות\' &gt; \'רשתות ותקשורת אלחוטית\'."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"ההתחברות עשויה להימשך מספר דקות..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"גע באפשרות "<b>"הבא"</b>" כדי להמשיך בהגדרה."\n\n"גע באפשרות "<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"גע ב"<b>"הבא"</b>" כדי להמשיך בהגדרה."\n\n"גע ב"<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"הסינכרון מופעל"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"הסינכרון מושבת"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"שגיאת סינכרון"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"יישום שנוקו בו הבאגים ממתין למנקה הבאגים לצירוף לפני ביצוע"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"קלט"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"שרטוט"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"עיבוד מואץ של חומרה"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"מעקב"</string>
     <string name="strict_mode" msgid="1938795874357830695">"מצב קפדני מופעל"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"גרום למסך להבהב כאשר יישומים מבצעים פעולות ארוכות בשרשור הראשי"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"מהטוב ביותר להכי גרוע: כחול, ירוק, אדום בהיר, אדום"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"השבת שכבות על של HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"השתמש תמיד ב-GPU להרכבת מסך"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"הפעל עקבות"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"בחירת עקבות פעילים"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"אין עקבות פעילים כעת"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"יש כעת <xliff:g id="NUM">%1$d</xliff:g> עקבות פעילים"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"כל העקבות הפעילים כעת"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"הפעל מעקבי OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"הצג את גבולות הפריסה"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"הצג גבולות קליפ, שוליים וכו\'"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"אכוף שימוש ב-GPU לשרטוט דו-מימדי"</string>
     <string name="force_msaa" msgid="7920323238677284387">"אלץ הפעלת 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"הפעל 4x MSAA ביישומי OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"נקה באגים בפעולות באזור שאינו מלבני"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"עיבוד פרופיל ב-GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"מדוד את משך העיבוד ב-adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"קנה מידה להנפשה של חלון"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"קנה מידה של הנפשת מעבר"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"קנה מידת משך זמן למנפיש"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"מגבלה של תהליך ברקע"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"הצג את כל פריטי ה-ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"הצג תיבת דו-שיח של \'יישום לא מגיב\' עבור יישומים שפועלים ברקע"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"השתמש בתצוגת אתר ניסיונית"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"יישומים ישתמשו בתצוגת האתר החדשה ביותר (ביטא)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"שימוש בנתונים"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"מחזור שימוש בנתונים"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"נדידת נתונים"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"הגבל נתוני רקע"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"שימוש נפרד ב-4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"הצג שימוש ב-Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"הצג שימוש ב-Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"הצג את השימוש ב-Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"נקודות חמות לנייד"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"סנכרון אוטומטי של נתונים"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"הגדר מגבלת נתונים לנייד"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"הגדר מגבלת נתונים של 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"הגדר מגבלת נתונים של 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"הגדר מגבלת נתונים של Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"הגדר מגבלת נתונים של Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Google לנייד"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטאבלט, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"חיבור הנתונים שלך בנייד יושבת כאשר תגיע למגבלה שצוינה."\n\n"מכיוון שנפח העברת הנתונים נמדד על ידי הטלפון, ומכיוון שייתכן שספק השירות שלך מחשב את נפח העברת הנתונים אחרת, מומלץ להשתמש במגבלה שמרנית."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"להגביל נתוני רקע?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"אם תגביל נתונים ניידים ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"אם תגביל את נתוני רקע לנייד, יישומים ושירותים מסוימים לא יפעלו אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"אם תגביל את נתוני הרקע לנייד, יישומים ושירותים מסוימים לא יפעלו אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם קיים חיבור Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"אם תגביל נתונים לנייד ברקע, יישומים ושירותים מסוימים לא יפעלו, אלא אם אתה מחובר לרשת Wi-Fi‏."\n\n"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"אזהרה"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"מגבלה"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"יישומים שהוסרו"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטאבלט. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטלפון. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"נקודות חמות לנייד"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"בחר את רשתות ה-Wi-Fi שהן נקודות חמות לנייד. ניתן להגביל את השימוש שיישומים עושים ברשתות אלה כאשר הם פועלים ברקע. יישומים יכולים גם להציג אזהרה לפני שימוש ברשתות אלה לביצוע הורדות גדולות."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"בחר את רשתות ה-Wi-Fi שהן נקודות חמות לנייד. ניתן להגביל את השימוש שיישומים עושים ברשתות אלה כאשר הם פועלים ברקע. יישומים יכולים גם להציג אזהרה לפני שימוש ברשתות אלה לביצוע הורדות גדולות."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"רשתות לנייד"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"רשתות Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"כדי לבחור נקודות חמות לנייד, הפעל את ה-Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"רשתות Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"כדי לבחור נקודות חמות לנייד, הפעל את ה-Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"שיחת חירום"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"חזור לשיחה"</string>
     <string name="vpn_name" msgid="4689699885361002297">"שם"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"מתירני"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"אכיפה"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"אתה"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"משתמשים אחרים"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"פעיל"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"לא פעיל"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"הוסף משתמש או פרופיל"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"פרופיל מוגבל"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"לפני שתוכל ליצור פרופיל מוגבל, תצטרך להגדיר נעילת מסך כדי להגן על היישומים ועל הנתונים האישיים שלך."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"הגדר נעילה"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"לא מוגדר"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"לא מוגדר - פרופיל מוגבל"</string>
     <string name="user_owner" msgid="3879126011135546571">"בעלים"</string>
+    <string name="user_you" msgid="1639158809315025986">"אתה (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"כינוי"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"הוספה"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"למשתמשים יש יישומים ותוכן משלהם"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"ניתן להגביל את הגישה לאפליקציות ולתוכן מהחשבון שלך"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"משתמש"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"פרופיל מוגבל"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"הוסף משתמש חדש"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"אתה יכול לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם יישומים, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם."\n\n"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה."\n\n"כל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"ניתן לשתף את המכשיר הזה עם אנשים אחרים על ידי יצירת משתמשים נוספים. לכל משתמש יש שטח משלו שהוא יכול להתאים אישית עם יישומים, טפט וכן הלאה. משתמשים יכולים גם להתאים את הגדרות הטאבלט, כגון Wi-Fi, שמשפיעות על כולם."\n\n"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה."\n\n"כל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"לאחר יצירת משתמש חדש, עליו לבצע תהליך הגדרה."\n\n"כל משתמש יכול לקבל הרשאות יישום מעודכנות בשם כל המשתמשים האחרים."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"האם להגדיר משתמש עכשיו?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ודא שהאדם זמין לקחת את הטאבלט ולהגדיר את השטח שלו"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"האם להגדיר פרופיל עכשיו?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"הגדר עכשיו"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"לא עכשיו"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"רק הבעלים של הטאבלט יכול לנהל משתמשים."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"רק הבעלים של הטלפון יכול לנהל משתמשים."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"פרופילים מוגבלים לא יכולים להוסיף חשבונות"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"מחק את <xliff:g id="USER_NAME">%1$s</xliff:g> ממכשיר זה"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"משתמש חדש"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"פרופיל חדש"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"האם למחוק אותך?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"האם להסיר משתמש?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"האם להסיר את הפרופיל?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"תאבד את השטח ואת והנתונים שלך בטאבלט. לא ניתן לבטל פעולה זו."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"תאבד את השטח ואת והנתונים שלך בטלפון. לא ניתן לבטל פעולה זו."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"השטח והנתונים של משתמש זה ייעלמו מהטאבלט. לא ניתן לבטל פעולה זו."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"השטח והנתונים של משתמש זה ייעלמו מהטלפון. לא ניתן לבטל פעולה זו."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"השטח והנתונים של הפרופיל הזה ייעלמו מהטאבלט. לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"השטח והנתונים של הפרופיל הזה ייעלמו מהטלפון. לא ניתן לבטל את הפעולה הזו."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"מוסיף משתמשים חדשים…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"מחק משתמש"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"מחק"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"אפשר יישומים ותוכן"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"יישומים והגבלות"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"הרחב את ההגדרות עבור היישום"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"הגדרה זו משפיעה על כל המשתמשים בטאבלט הזה."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"הגדרה זו משפיעה על כל המשתמשים בטלפון הזה."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"שנה שפה"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"זיהוי תמונה"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"שידורים סלולריים"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"בחר את סוגי התראות החירום להצגה."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"הגבלות על אפליקציות ותוכן"</string>
+    <string name="user_rename" msgid="8523499513614655279">"שנה שם"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"הגדר הגבלות ליישום"</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="restriction_wifi_config_title" msgid="8889556384136994814">"רשת Wi‑Fi ורשת לנייד"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"אפשר שינוי של הגדרות רשת Wi-Fi ורשת לנייד"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"אפשר שינויים של התאמות והגדרות Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"אפשר חילופי מידע כאשר הטאבלט נוגע במכשיר אחר"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"אפשר חילופי מידע כאשר הטלפון נוגע במכשיר אחר"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"גישה למיקום"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"התר ליישום להשתמש במידע המיקום שלך"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"הקודם"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"הבא"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"סיום"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"צלם תמונה"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"בחר תמונה מתוך \'גלריה\'"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 2c2e94f..21f877d 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"遅い"</item>
     <item msgid="1145554631248513562">"標準"</item>
     <item msgid="7553665153391107454">"速い"</item>
-    <item msgid="2538100882620724753">"非常に速い"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"なし"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"なし"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"指定なし"</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">"内部端末ストレージ"</item>
     <item msgid="3738430123799803530">"リムーバブルSDカード"</item>
     <item msgid="4498124044785815005">"システムで判断する"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"位置情報"</item>
+    <item msgid="255608127647030286">"プライベート"</item>
+    <item msgid="4588829735729884491">"メッセージ"</item>
+    <item msgid="8971765125227378270">"端末"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"おおよその位置情報"</item>
+    <item msgid="5789673140227507995">"精細な位置情報"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"バイブレーション"</item>
+    <item msgid="3434165993711230924">"連絡先の読み取り"</item>
+    <item msgid="616161687718081936">"連絡先の変更"</item>
+    <item msgid="7638002295329050091">"通話履歴の読み取り"</item>
+    <item msgid="6546959730920410907">"通話履歴の変更"</item>
+    <item msgid="446877710771379667">"カレンダーの読み取り"</item>
+    <item msgid="7674458294386319722">"カレンダーの変更"</item>
+    <item msgid="8281201165558093009">"Wi-Fiスキャン"</item>
+    <item msgid="8694611243479480497">"通知"</item>
+    <item msgid="7776439107987345446">"セルスキャン"</item>
+    <item msgid="514615766544675057">"通話の発信"</item>
+    <item msgid="8181415497109310680">"SMSの読み取り"</item>
+    <item msgid="6816551144382117307">"SMSの書き込み"</item>
+    <item msgid="4600463921908905030">"SMSの受信"</item>
+    <item msgid="5958926493289432745">"緊急SMSの受信"</item>
+    <item msgid="4945269495221089540">"MMSの受信"</item>
+    <item msgid="5570472453573929087">"WAPプッシュの受信"</item>
+    <item msgid="7125408150230860501">"SMSの送信"</item>
+    <item msgid="7080337936612188061">"ICC SMSの読み取り"</item>
+    <item msgid="587124103118495063">"ICC SMSの書き込み"</item>
+    <item msgid="2320577158869025503">"設定の変更"</item>
+    <item msgid="1545733463471924009">"上部に描画"</item>
+    <item msgid="3609046903962454582">"通知へのアクセス"</item>
+    <item msgid="4671646036128214513">"カメラ"</item>
+    <item msgid="1097324338692486211">"音声の録音"</item>
+    <item msgid="5031552983987798163">"音声の再生"</item>
+    <item msgid="8374996688066472414">"クリップボードの読み取り"</item>
+    <item msgid="3045529469061083747">"クリップボードの変更"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置情報"</item>
+    <item msgid="8677040780775113033">"位置情報"</item>
+    <item msgid="1660743989948992916">"位置情報"</item>
+    <item msgid="8791172739860195290">"バイブレーション"</item>
+    <item msgid="383413555642128046">"連絡先の読み取り"</item>
+    <item msgid="3654594895269697313">"連絡先の変更"</item>
+    <item msgid="7928393476362362538">"通話履歴の読み取り"</item>
+    <item msgid="6248591205254641116">"通話履歴の変更"</item>
+    <item msgid="6093344633066170692">"カレンダーの読み取り"</item>
+    <item msgid="1334886368750347692">"カレンダーの変更"</item>
+    <item msgid="1638204101698708656">"位置情報"</item>
+    <item msgid="2154671955760380322">"通知の投稿"</item>
+    <item msgid="4282477730595931828">"位置情報"</item>
+    <item msgid="4891423912898525905">"通話の発信"</item>
+    <item msgid="626463821668200388">"SMS/MMSの受信"</item>
+    <item msgid="1237538540368797101">"SMS/MMSの送信"</item>
+    <item msgid="3986142739951490025">"SMS/MMSの受信"</item>
+    <item msgid="3984213795861739778">"SMS/MMSの受信"</item>
+    <item msgid="3656243523752472788">"SMS/MMSの受信"</item>
+    <item msgid="8105802370238551510">"SMS/MMSの受信"</item>
+    <item msgid="1407766984645388488">"SMS/MMSの送信"</item>
+    <item msgid="1530132603376027248">"SMS/MMSの受信"</item>
+    <item msgid="1188256962149204607">"SMS/MMSの送信"</item>
+    <item msgid="4218544235221631789">"設定の変更"</item>
+    <item msgid="736541391767350377">"上部に描画"</item>
+    <item msgid="5530815681721654194">"通知へのアクセス"</item>
+    <item msgid="781213371706962767">"カメラ"</item>
+    <item msgid="1720492593061838172">"音声の録音"</item>
+    <item msgid="3493046322001257041">"音声の再生"</item>
+    <item msgid="136815868796597058">"クリップボードの読み取り"</item>
+    <item msgid="5238692940326972503">"クリップボードの変更"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短め"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace（画像）"</item>
     <item msgid="1340692776955662664">"glGetErrorでのスタック呼び出し"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"オフ"</item>
+    <item msgid="675719912558941285">"非矩形クリップ領域を青で描画"</item>
+    <item msgid="1064373276095698656">"テスト済み描画コマンドを緑でハイライト表示"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"OFF"</item>
+    <item msgid="2751513398307949636">"バーとして画面に表示"</item>
+    <item msgid="8272260411216018353">"行として画面に表示"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfoを使用"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準の上限"</item>
     <item msgid="4071574792028999443">"バックグラウンドプロセスを使用しない"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index e54f496..f1ab5f9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -270,7 +270,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"機内モード"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"その他..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線とネットワーク"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNの設定"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNの設定"</string>
     <string name="roaming" msgid="3596055926335478572">"データローミング"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"ローミング中にデータサービスに接続します"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"ローミング中にデータサービスに接続します"</string>
@@ -288,7 +288,7 @@
     <string name="date_time_auto" msgid="7076906458515908345">"日付と時刻の自動設定"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ネットワークから提供された時刻を使用する"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ネットワークから提供された時刻を使用する"</string>
-    <string name="zone_auto" msgid="334783869352026648">"タイムゾーンを自動設定"</string>
+    <string name="zone_auto" msgid="334783869352026648">"タイムゾーンの自動設定"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ネットワークから提供されたタイムゾーンを使用する"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ネットワークから提供されたタイムゾーンを使用します"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24時間表示"</string>
@@ -311,6 +311,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"ロック画面に表示するテキストを入力します"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"ロック画面にユーザー情報を表示"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ユーザー情報"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ロック画面にプロフィール情報を表示"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"プロフィール情報"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"位置情報アクセス"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"セキュリティ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
@@ -420,6 +422,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"デバイス管理"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"端末管理者"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理者を表示または無効にする"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"通知へのアクセス"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -496,7 +507,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"設定を保存"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"ワイヤレスディスプレイ"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"デバイスを表示するにはワイヤレスディスプレイをONにしてください。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wi-FiがOFFになっているためワイヤレスディスプレイは無効になっています。"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-FiがOFFになっているためワイヤレスディスプレイは無効になっています。"</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ディスプレイを検索"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"検索中…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"付近にワイヤレスディスプレイは見つかりません。"</string>
@@ -526,50 +537,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"この機能をONにすると、別のNFC対応の端末を近づけて持ち、アプリのコンテンツをビームすることができます。たとえば、ブラウザのページ、YouTubeの動画、連絡帳の連絡先などをビームできます。"\n\n"2 つの端末を近づけて（通常は背面を向かい合わせにして）、画面をタップします。何をビームするかはアプリが判断します。"</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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-FiをONにする"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi設定"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-FiをONにする"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fiの設定"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ワイヤレスアクセスポイントを設定する"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wi-Fiの選択"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-FiをONにしています..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-FiをOFFにします..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fiの選択"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi-FiをONにしています…"</string>
+    <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="3038290727701553612">"オープンネットワークが利用可能なときに通知する"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"接続不良のとき無効にする"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"スリープ時にWi-Fi接続を維持"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"安定したインターネット接続があるときのみWi-Fiネットワークを使用する"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"スキャンを常に実行する"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Wi-FiがOFFになっていても、Googleの位置情報サービスと他のアプリでネットワークをスキャンする"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"証明書のインストール"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"位置情報の精度を向上させるため、Wi-FiがOFFの場合でもGoogleやその他のアプリは近くのネットワークをスキャンすることができます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Wi-FiがOFFの場合でもアプリは近くのネットワークをスキャンできます。このスキャンが必要ない場合は、[詳細設定] &gt; [スキャンを常に実行する]にアクセスします。"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"次回から表示しない"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"スリープ時にWi-Fi接続を維持"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"設定の変更中に問題が発生しました"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi最適化"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-FiがONのときに電池使用を節約します"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi最適化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-FiがONのときに電池使用を節約する"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"ネットワークを追加"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fiネットワーク"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fiネットワーク"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPSプッシュボタン"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"その他のオプション"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN入力"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"ネットワークに接続"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ネットワークから切断"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"利用可能なネットワークを表示するにはWi-FiをON"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fiネットワークを検索中…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"利用可能なネットワークを表示するにはWi-FiをON"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fiネットワークを検索しています…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wi-Fiネットワークを変更する権限がありません。"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"他のネットワーク…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"その他"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定（WPS）"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"セットアップを完了するには、タブレットでWi-Fiに接続する必要があります。セットアップ後にモバイルデータ通信とWi-Fiを切り替えられます。"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"セットアップを完了するには、タブレットでWi-Fiに接続する必要があります。セットアップ後にモバイルデータ通信とWi-Fiを切り替えられます。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"詳細オプションを表示"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi保護設定"</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="7204827509934892103">"ルーターのWi-Fi保護設定ボタンを押します。「WPS」と表記されている場合や、次のような記号が表示されている場合もあります:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Wi-FiルーターでPIN「<xliff:g id="NUMBER">%1$s</xliff:g>」を入力します。セットアップの完了まで最大2分ほどかかることがあります。"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"ルーターの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="5754399645462924103">"Wi-Fiネットワーク<xliff:g id="NETWORK_NAME">%s</xliff:g>に接続しました"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続しました"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPSを設定中です。完了まで最大2分程度かかることがあります。"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPSの設定に失敗しました。数分後にもう一度お試しください。"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"無線ルーターのセキュリティ設定（WEP）はサポートされていません"</string>
@@ -577,6 +595,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"認証に失敗しました。もう一度お試しください。"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"別のWPSセッションが検出されました。数分後にもう一度お試しください。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"ネットワークSSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSIDを入力します"</string>
     <string name="wifi_security" msgid="6603611185592956936">"セキュリティ"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"電波強度"</string>
     <string name="wifi_status" msgid="4824568012414605414">"接続状況"</string>
@@ -603,6 +622,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</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_confirm_allow" msgid="5355973075896817232">"許可する"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"許可しない"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"接続"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ネットワークに接続できませんでした"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"切断"</string>
@@ -614,12 +636,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"スキップしない"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"タブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告: 追加のデータ通信料が発生する可能性があります。"\n\n"タブレットのセットアップでは大量のネットワーク処理が必要となる場合があります。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告: タブレットは、ソフトウェアが最新の状態かどうかを確認できません。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告: 携帯端末は、ソフトウェアが最新の状態かどうかを確認できません。"</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"携帯端末からこのWi-Fiネットワークに接続できませんでした。"</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi詳細設定"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi周波数帯域"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告: インターネットに接続しないと、タブレットはソフトウェアが最新であることを確認できません。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告: インターネットに接続しないと、携帯端末はソフトウェアが最新であることを確認できません。"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"タブレットからこのWi-Fiネットワークに接続できませんでした。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"携帯端末からこのWi-Fiネットワークに接続できませんでした。"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi詳細設定"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi周波数帯域"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"使用する周波数帯域を指定する"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"周波数帯域の設定中に問題が発生しました。"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MACアドレス"</string>
@@ -635,7 +657,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"ゲートウェイ"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ネットワークプレフィックス長"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"デバイス情報"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"この接続を保存"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"デバイスの検索"</string>
@@ -651,13 +673,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"このグループとの接続を切断しますか？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"ポータブルWi-Fiアクセスポイント"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"アクセスポイントをONにしています…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"アクセスポイントをOFFにしています…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ポータブルアクセスポイント<xliff:g id="NETWORK_SSID">%1$s</xliff:g>が有効です"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ポータブルWi-Fiアクセスポイントエラー"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fiアクセスポイントを設定"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"ポータブルWi-Fiアクセスポイントエラー"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"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="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
@@ -792,7 +814,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"電波強度"</string>
     <string name="status_roaming" msgid="2638800467430913403">"ローミング"</string>
     <string name="status_operator" msgid="2274875196954742087">"ネットワーク"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MACアドレス"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MACアドレス"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetoothアドレス"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"シリアル番号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不明"</string>
@@ -805,7 +827,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"空き容量（読み取り専用）"</string>
     <string name="memory_size" msgid="6629067715017232195">"合計容量"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"計算中..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"アプリ（アプリのデータとメディアコンテンツ）"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"アプリ（データとコンテンツ）"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"メディア"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ダウンロード"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"画像、動画"</string>
@@ -881,6 +903,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APNは有効です"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APNは無効です"</string>
     <string name="bearer" msgid="594270280031923558">"ベアラー"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNOの種類"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO値"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APNを削除"</string>
     <string name="menu_new" msgid="3014205883303921729">"新しいAPN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
@@ -957,9 +981,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ヘルプ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"モバイルネットワーク"</string>
     <string name="location_title" msgid="1029961368397484576">"現在地"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi/モバイル接続時の位置情報"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fiで検出される現在地"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fiで検出される現在地"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS機能"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"タブレットでGPSを使用して現在地を特定することをアプリに許可する"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"携帯端末でGPSを使用して現在地を特定することをアプリに許可する"</string>
@@ -1084,6 +1108,7 @@
     <string name="filter" msgid="2018011724373033887">"フィルタ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"フィルタオプションの選択"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"すべて"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"無効"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ダウンロード済み"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"実行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USBストレージ"</string>
@@ -1143,6 +1168,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"内蔵アプリを無効にすると、他のアプリが正常に動作しなくなることがあります。データも削除されます。"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"通知をOFFにしますか？"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"このアプリの通知をOFFにすると、重要なアラートや更新を見逃すおそれがあります。"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"アプリの操作状況"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"実行中"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"（未使用）"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"ストレージ使用状況"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"アプリのストレージ使用状況を表示する"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
@@ -1222,6 +1250,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"単語:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ショートカット:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"言語:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"単語を入力します"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"オプションのショートカット"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"語句の編集"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"編集"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"削除"</string>
@@ -1262,8 +1292,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"物理キーボードの設定"</string>
     <string name="development_settings_title" msgid="215179176067683667">"開発者向けオプション"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"アプリ開発オプションを設定する"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"デベロッパー向けオプションはこのユーザーには表示されません"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB接続時はデバッグモードにする"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"USBデバッグの許可の取り消し"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"電源メニューのバグレポート"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"電源メニューにバグレポートを取得するオプションを含める"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"スリープモードにしない"</string>
@@ -1272,10 +1304,11 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"開発用の設定を許可しますか？"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"これらの設定は開発専用に設計されています。そのため端末や端末上のアプリが故障したり正常に動作しなくなったりするおそれがあります。"</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB経由のアプリを確認"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"ADB/ADT経由でインストールされたアプリに不正な動作がないかを確認します。"</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"ADB/ADT経由でインストールされたアプリに不正な動作がないかを確認する"</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"USBストレージの保護"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"アプリによるUSBストレージの読み取り権限のリクエストが必要"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"USBストレージの保護"</string>
@@ -1316,23 +1349,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"電源ボタンで通話を終了"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"パスワードの音声出力"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"押し続ける時間"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"ウェブアクセシビリティの拡張"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ON"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"OFF"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"許可"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"許可していません"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"許可"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"許可しない"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g>を利用しますか？"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>を有効にすると、入力したすべてのテキスト（パスワードを除く）が収集される可能性があります。これにはクレジットカード番号などの個人データも含まれます。タブレットの操作に関するデータも収集される可能性があります。"</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>を有効にすると、入力したすべてのテキスト（パスワードを除く）が収集される可能性があります。これにはクレジットカード番号などの個人データも含まれます。端末の操作に関するデータも収集される可能性があります。"</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g>を停止しますか？"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"[OK]をタップすると<xliff:g id="SERVICE">%1$s</xliff:g>が停止します。"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"操作の監視"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"ユーザーがアプリでアクセスしているときに通知を受け取ります。"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>を停止しますか？"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"[OK]をタップすると<xliff:g id="SERVICE">%1$s</xliff:g>が停止します。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"インストールされているサービスはありません"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"スクリーンリーダーをご利用になりますか？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkbackは音声で応答するアプリで、目の不自由なユーザーや低視力のユーザーを支援します。Androidマーケットから無料でインストールできます。"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"アプリからウェブコンテンツへのアクセスを容易にするためのスクリプトをGoogleからインストールしてもよろしいですか？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"説明はありません。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
@@ -1346,22 +1374,22 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"充電中"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"画面点灯"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPSがON"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"スリープなし"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"モバイルネットワークの電波"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-FiをONにしている時間"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-FiをONにしている時間"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-FiをONにしている時間"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-FiをONにしている時間"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"履歴の詳細"</string>
     <string name="details_title" msgid="3792801565213935385">"使用状況の詳細"</string>
-    <string name="details_subtitle" msgid="32593908269911734">"詳細を使用"</string>
+    <string name="details_subtitle" msgid="32593908269911734">"使用状況の詳細"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"消費電力の調整"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"含まれているパッケージ"</string>
     <string name="power_screen" msgid="3023346080675904613">"画面"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"セルスタンバイ"</string>
     <string name="power_phone" msgid="5392641106474567277">"通話"</string>
@@ -1371,20 +1399,20 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPUフォアグラウンド"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"スリープモードにしない"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi使用"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi使用"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"タブレット"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"電話"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"送信されたデータ"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"受信したデータ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"音声"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"動画"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"有効に設定した時間"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"点灯時間"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"圏外時間"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"強制停止"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"アプリ情報"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"アプリの設定"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"画面の設定"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi設定"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fiの設定"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetoothの設定"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"通話の電池使用量"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"アイドル時の電池使用量"</string>
@@ -1393,8 +1421,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"電波が届かない場所では機内モードに切り替えて電池を節約します。"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"ディスプレイとバックライトの電池使用量"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"画面の明るさを下げたり画面消灯までの時間を短くしたりします"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fiの電池使用量"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"未使用時または圏外のときWi-FiをOFFにします"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fiの電池使用量"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"未使用時または圏外のときWi-FiをOFFにします"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetoothの電池使用量"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"未使用時はBluetoothをOFFにします"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"別のBluetoothデバイスに接続してみてください"</string>
@@ -1440,6 +1468,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"別のエンジンを選択"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"この音声合成エンジンを使用すると、読み上げるすべてのテキストの収集をエンジン（<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>）に許可することになります。これにはパスワードやクレジットカード番号などの個人情報も含まれます。この音声合成エンジンを有効にしますか？"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"この言語でテキスト読み上げを出力するには、ネットワーク接続が正常に機能している必要があります。"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"エンジン"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>の設定"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>は有効です"</string>
@@ -1457,14 +1486,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"優先するエンジン"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"全般"</string>
     <string name="gadget_title" msgid="5519037532720577836">"電源管理"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi設定の更新"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi設定の更新"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth設定の更新"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ON"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"OFF"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ONにしています"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"OFFにしています"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"同期"</string>
@@ -1487,6 +1516,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"証明書をすべて削除する"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信頼できる認証情報"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"信頼できるCA証明書を表示する"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"ストレージのタイプ"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ハードウェア式"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"ソフトウェアのみ"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ロック解除パターンを入力してください"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1508,7 +1540,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"バックアップと復元"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人データ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"データのバックアップ"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"アプリのデータ、Wi-Fiパスワード、その他の設定をGoogleサーバーにバックアップする"</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="auto_restore_title" msgid="5397528966329126506">"自動復元"</string>
@@ -1520,7 +1552,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"新しいパスワードと確認用のパスワードが一致しません。"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"バックアップパスワードの設定に失敗しました"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fiパスワード、ブックマーク、その他の設定とアプリのデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去しますか？"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fiパスワード、ブックマーク、その他の設定とアプリのデータのバックアップを停止し、Googleサーバー上のすべてのコピーを消去しますか？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"デバイス管理の設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"デバイス管理者"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"無効にする"</string>
@@ -1536,10 +1568,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"通話着信音とバイブレーション"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"システム"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi設定"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続中..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続済み"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fiのセットアップ"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続中…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi-Fiネットワーク「<xliff:g id="NETWORK_NAME">%s</xliff:g>」に接続済み"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"ネットワークの追加"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"接続されていません"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"ネットワークを追加"</string>
@@ -1561,9 +1593,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"接続しています..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"次のステップに進みます"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAPはサポートされていません。"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"EAP Wi-Fi接続はセットアップ時に設定できません。セットアップの完了後に[設定]の[無線とネットワーク]で設定することができます。"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"EAP Wi-Fi接続はセットアップ時に設定できません。セットアップの完了後に[設定]の[無線とネットワーク]で設定することができます。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"接続には数分かかることがあります..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"設定を続けるには["<b>"次へ"</b>"]をタップします。"\n\n"別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"セットアップを続けるには["<b>"次へ"</b>"]をタップします。"\n\n"別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同期が有効です"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同期は無効になっています"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同期エラー。"</string>
@@ -1576,7 +1608,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"アプリがデータをいつでも同期、送信、受信可能にする"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"バックグラウンドを無効化"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"バックグラウンドデータを無効にすると、データの使用量が減るため電池を節約できます。一部のアプリでは引き続きバックグラウンドデータの接続を使用します。"</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"アプリのデータを自動同期する"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"データの自動更新"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"同期ON"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"同期OFF"</string>
     <string name="sync_error" msgid="5060969083117872149">"同期エラー"</string>
@@ -1631,6 +1663,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"アプリは実行前にデバッガのアタッチを待機します"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"入力"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"描画"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"ハードウェアアクセラレーテッドレンダリング"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"監視"</string>
     <string name="strict_mode" msgid="1938795874357830695">"厳格モードを有効にする"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"メインスレッドの処理が長引く場合は画面を点滅させる"</string>
@@ -1648,11 +1681,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"良好な状態から順に: 青、緑、薄い赤、赤"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"トレースを有効にする"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"有効なトレースを選択"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"現在有効なトレースはない"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"現在<xliff:g id="NUM">%1$d</xliff:g>件のトレースが有効"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"現在トレースはすべて有効"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGLトレースを有効化"</string>
     <string name="debug_layout" msgid="5981361776594526155">"レイアウト境界を表示"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"クリップの境界線、マージンなどを表示"</string>
@@ -1662,8 +1690,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"2D描画にGPUを常に使用する"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAAを適用"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"OpenGL ES 2.0アプリで4x MSAAを有効にする"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"非矩形クリップ操作をデバッグ"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPUレンダリングのプロフィール作成"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"adb shell dumpsys gfxinfoでレンダリング時間を測定"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"ウィンドウアニメスケール"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"トランジションアニメスケール"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator再生時間スケール"</string>
@@ -1674,12 +1702,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"バックグラウンドプロセスの上限"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"すべてのANRを表示"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"バックグラウンドアプリが応答しない場合に通知する"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"試験運用版WebViewを使用"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"アプリは最新（ベータ版）のWebViewを使用します"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"データ使用"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"データ使用サイクル"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"データローミング"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"バックグラウンドデータを制限する"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G使用を別にする"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi使用を表示する"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wi-Fi使用を表示する"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"イーサネットの使用状況を表示する"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"モバイルアクセスポイント"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"データの自動同期"</string>
@@ -1693,8 +1723,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"モバイルデータの制限を設定する"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4Gデータの制限を設定する"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G～3Gデータの制限を設定する"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Wi-Fiデータの制限を設定する"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi-Fiデータの制限を設定する"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"イーサネット"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"モバイル"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1725,9 +1755,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用はタブレットで記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"モバイルデータ接続は指定の制限に達した場合無効になります。"\n\n"データ利用は携帯端末で記録されますが、携帯通信会社の利用明細は異なる可能性があるため、制限にできるだけ余裕をみておくことをおすすめします。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"バックグラウンドデータを制限しますか？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこの端末上のすべてのユーザーに影響します。"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"バックグラウンドのモバイルデータを制限すると、アプリやサービスによっては、Wi-Fiネットワーク未接続時に機能しない場合があります。"\n\n"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"に制限"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"削除したアプリケーション"</string>
@@ -1737,10 +1767,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: 約<xliff:g id="TOTAL">%1$s</xliff:g>使用（タブレットでの記録。携帯通信会社の利用明細は異なる場合があります）"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: 約<xliff:g id="TOTAL">%1$s</xliff:g>使用（携帯端末での記録。携帯通信会社の利用明細は異なる場合があります）"</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"モバイルアクセスポイント"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"モバイルアクセスポイントであるWi-Fiネットワークを選択します。このネットワークの使用をバックグラウンド中のアプリに禁止することができます。このネットワークで大量のダウンロードをする前に、アプリが警告することもできます。"</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"モバイルアクセスポイントであるWi-Fiネットワークを選択します。このネットワークの使用をバックグラウンド中のアプリに禁止することができます。このネットワークで大量のダウンロードを開始する前に、アプリが警告することもできます。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"モバイルネットワーク"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fiネットワーク"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"モバイルアクセスポイントを選択するには、Wi-FiをONにします。"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fiネットワーク"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"モバイルアクセスポイントを選択するには、Wi-FiをONにします。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急通報"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"通話に戻る"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名前"</string>
@@ -1798,34 +1828,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ユーザー"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"自分"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"その他のユーザー"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"ユーザーを追加"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"有効"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"無効"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"ユーザーとプロフィール"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"ユーザーまたはプロフィールを追加"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"制限付きプロフィール"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"制限付きプロフィールを作成する場合は、アプリや個人データを保護するように画面ロックを設定しておく必要があります。"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"ロックを設定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"セットアップしていません"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"セットアップしていません - 制限付きプロフィール"</string>
     <string name="user_owner" msgid="3879126011135546571">"所有者"</string>
+    <string name="user_you" msgid="1639158809315025986">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ニックネーム"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"追加"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ユーザーは自分のアプリとコンテンツを持っています"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"あなたのアカウントからアプリやコンテンツへのアクセスを制限できます"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"ユーザー"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"制限付きプロフィール"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新しいユーザーを追加する"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響するタブレット設定を変更することもできます。"\n\n"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。"\n\n"すべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"追加ユーザーを作成して、この端末を他のユーザーと共有できます。各ユーザーは各自のスペースを所有でき、アプリや壁紙などを使用してカスタマイズできます。Wi-Fiなど、すべてのユーザーに影響するタブレット設定を変更することもできます。"\n\n"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。"\n\n"すべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"新しいユーザーを作成したら、そのユーザーはセットアップ処理を完了する必要があります。"\n\n"すべてのユーザーは他のユーザーの代わりに更新されたアプリの許可を承認できます。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ユーザーを今すぐセットアップ"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ユーザーがタブレットを使って各自のスペースをセットアップできるよう確認してください"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"プロフィールを今すぐセットアップしますか？"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"今すぐセットアップ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"後で行う"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"ユーザーを管理できるのはタブレットの所有者のみです。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"ユーザーを管理できるのは携帯端末の所有者のみです。"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"制限付きプロフィールではアカウントを追加できません"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"この端末から<xliff:g id="USER_NAME">%1$s</xliff:g>を削除"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新しいユーザー"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"新しいプロフィール"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"自分を削除しますか？"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"ユーザーを削除しますか？"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"プロフィールを削除しますか？"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"このタブレットのスペースとデータが失われます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"この携帯端末のスペースとデータが失われます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"このユーザーのスペースとデータがタブレットから消去されます。この操作は元に戻せません。"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"このユーザーのスペースとデータが携帯端末から消去されます。この操作は元に戻せません。"</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"このプロフィールのスペースとデータがタブレットから消去されます。この操作は元に戻せません。"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"このプロフィールのスペースとデータが携帯電話から消去されます。この操作は元に戻せません。"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"新しいユーザーを追加中…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ユーザーを削除"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"削除"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"この設定はこのタブレット上のすべてのユーザーに影響します。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"この設定はこの端末上のすべてのユーザーに影響します。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"言語の変更"</string>
@@ -1834,6 +1880,27 @@
     <string name="help_label" msgid="1107174367904110532">"ヘルプ"</string>
     <string name="user_account_title" msgid="1127193807312271167">"コンテンツのアカウント"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"画像ID"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"エリアメール"</string>
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"緊急警報"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"表示する緊急警報の種類を選択してください。"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"アプリとコンテンツの制限"</string>
+    <string name="user_rename" msgid="8523499513614655279">"名前を変更"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"アプリの制限を設定"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi-Fiとモバイル"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Wi-Fiとモバイルの設定の変更を許可する"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetoothのペア設定や設定の変更を許可する"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"タブレットが他のデバイスと接触したときのデータ交換を許可する"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"携帯電話が他のデバイスと接触したときのデータ交換を許可する"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"位置情報アクセス"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"アプリに位置情報の使用を許可する"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"戻る"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"次へ"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"終了"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"写真を撮影"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"ギャラリーから画像を選ぶ"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 0c4828f..ab1d5f8 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"느림"</item>
     <item msgid="1145554631248513562">"보통"</item>
     <item msgid="7553665153391107454">"빠름"</item>
-    <item msgid="2538100882620724753">"매우 빠름"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"없음"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"없음"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"지정되지 않음"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"없음"</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">"내부 기기 저장용량"</item>
     <item msgid="3738430123799803530">"이동식 SD 카드"</item>
     <item msgid="4498124044785815005">"시스템에서 결정"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"위치"</item>
+    <item msgid="255608127647030286">"개인"</item>
+    <item msgid="4588829735729884491">"메시지"</item>
+    <item msgid="8971765125227378270">"기기"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"대략적 위치"</item>
+    <item msgid="5789673140227507995">"세부 위치"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"진동"</item>
+    <item msgid="3434165993711230924">"주소록 읽기"</item>
+    <item msgid="616161687718081936">"주소록 수정"</item>
+    <item msgid="7638002295329050091">"통화 기록 읽기"</item>
+    <item msgid="6546959730920410907">"통화 기록 수정"</item>
+    <item msgid="446877710771379667">"캘린더 읽기"</item>
+    <item msgid="7674458294386319722">"캘린더 수정"</item>
+    <item msgid="8281201165558093009">"Wi-Fi 검색"</item>
+    <item msgid="8694611243479480497">"알림"</item>
+    <item msgid="7776439107987345446">"셀 검색"</item>
+    <item msgid="514615766544675057">"전화 걸기"</item>
+    <item msgid="8181415497109310680">"SMS 읽기"</item>
+    <item msgid="6816551144382117307">"SMS 작성하기"</item>
+    <item msgid="4600463921908905030">"SMS 수신"</item>
+    <item msgid="5958926493289432745">"긴급 SMS 수신"</item>
+    <item msgid="4945269495221089540">"MMS 수신"</item>
+    <item msgid="5570472453573929087">"WAP PUSH 수신"</item>
+    <item msgid="7125408150230860501">"SMS 보내기"</item>
+    <item msgid="7080337936612188061">"ICC SMS 읽기"</item>
+    <item msgid="587124103118495063">"ICC SMS 작성하기"</item>
+    <item msgid="2320577158869025503">"설정 수정"</item>
+    <item msgid="1545733463471924009">"위에 그림"</item>
+    <item msgid="3609046903962454582">"액세스 알림"</item>
+    <item msgid="4671646036128214513">"카메라"</item>
+    <item msgid="1097324338692486211">"오디오 녹음"</item>
+    <item msgid="5031552983987798163">"오디오 재생"</item>
+    <item msgid="8374996688066472414">"클립보드 읽기"</item>
+    <item msgid="3045529469061083747">"클립보드 수정"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"위치"</item>
+    <item msgid="8677040780775113033">"위치"</item>
+    <item msgid="1660743989948992916">"위치"</item>
+    <item msgid="8791172739860195290">"진동"</item>
+    <item msgid="383413555642128046">"주소록 읽기"</item>
+    <item msgid="3654594895269697313">"주소록 수정"</item>
+    <item msgid="7928393476362362538">"통화 기록 읽기"</item>
+    <item msgid="6248591205254641116">"통화 기록 수정"</item>
+    <item msgid="6093344633066170692">"캘린더 읽기"</item>
+    <item msgid="1334886368750347692">"캘린더 수정"</item>
+    <item msgid="1638204101698708656">"위치"</item>
+    <item msgid="2154671955760380322">"소식 알림"</item>
+    <item msgid="4282477730595931828">"위치"</item>
+    <item msgid="4891423912898525905">"전화 걸기"</item>
+    <item msgid="626463821668200388">"SMS/MMS 수신"</item>
+    <item msgid="1237538540368797101">"SMS/MMS 전송"</item>
+    <item msgid="3986142739951490025">"SMS/MMS 수신"</item>
+    <item msgid="3984213795861739778">"SMS/MMS 수신"</item>
+    <item msgid="3656243523752472788">"SMS/MMS 수신"</item>
+    <item msgid="8105802370238551510">"SMS/MMS 수신"</item>
+    <item msgid="1407766984645388488">"SMS/MMS 전송"</item>
+    <item msgid="1530132603376027248">"SMS/MMS 수신"</item>
+    <item msgid="1188256962149204607">"SMS/MMS 전송"</item>
+    <item msgid="4218544235221631789">"설정 수정"</item>
+    <item msgid="736541391767350377">"위에 그림"</item>
+    <item msgid="5530815681721654194">"액세스 알림"</item>
+    <item msgid="781213371706962767">"카메라"</item>
+    <item msgid="1720492593061838172">"오디오 녹음"</item>
+    <item msgid="3493046322001257041">"오디오 재생"</item>
+    <item msgid="136815868796597058">"클립보드 읽기"</item>
+    <item msgid="5238692940326972503">"클립보드 수정"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"짧게"</item>
     <item msgid="2560532955514699713">"보통"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace(그래픽)"</item>
     <item msgid="1340692776955662664">"glGetError의 스택 호출"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"화면에 막대로 표시"</item>
+    <item msgid="8272260411216018353">"화면에 선으로 표시"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo에서 사용"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"표준 제한"</item>
     <item msgid="4071574792028999443">"백그라운드 프로세스 없음"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 4fa2d65..f4d0438 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"비행기 모드"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"더보기..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"무선 및 네트워크 설정"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, 블루투스, 비행기 모드, 모바일 네트워크 및 VPN 관리"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, 블루투스, 비행기 모드, 모바일 네트워크 및 VPN 관리"</string>
     <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"로밍 시 데이터 서비스에 연결"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"로밍 시 데이터 서비스에 연결"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"화면 잠금에 표시할 텍스트를 입력하세요."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"잠금 화면에 사용자 정보 표시"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"사용자 정보"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"잠금 화면에 프로필 정보 표시"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"프로필 정보"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"위치 정보 액세스"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"기기 관리"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"기기 관리자"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"기기 관리자 보기 또는 비활성화"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"알림 액세스"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"블루투스"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"블루투스 켜기"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"블루투스"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"설정 기억"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"무선 디스플레이"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"기기를 확인하려면 무선 디스플레이를 켜세요."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wi-Fi가 꺼져 있기 때문에 무선 디스플레이를 사용할 수 없습니다."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wi-Fi가 꺼져 있기 때문에 무선 디스플레이를 사용할 수 없습니다."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"디스플레이 검색"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"검색 중..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"주변에 검색된 무선 디스플레이가 없습니다."</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi 켜기"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 설정"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi-Fi 사용"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 설정"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"무선 액세스포인트(AP) 설정 및 관리"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wi-Fi 선택"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi를 켜는 중"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi 사용 중지 중..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wi-Fi 선택"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi 사용 설정 중..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Wi-Fi 사용 중지 중..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"오류"</string>
     <string name="wifi_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="3038290727701553612">"개방형 네트워크를 사용할 수 있을 때 알림"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"불량 네트워크 방지"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"절전 모드 동안 Wi-Fi 연결 유지"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"인터넷 연결이 원활하지 않은 경우 Wi-Fi 네트워크를 사용하지 않음"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"네트워크 항상 검색"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Wi-Fi가 꺼져 있을 때에도 Google의 위치 서비스 및 기타 앱이 네트워크를 검색함"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"인증서 설치"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"정확성 개선 등의 목적으로 Google 및 기타 앱이 근처 Wi-Fi 네트워크를 스캔할 수 있습니다. Wi-Fi가 꺼져 있을 때도 작동합니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"앱이 Wi-Fi가 꺼져 있을 때도 근처 네트워크를 스캔할 수 있습니다. 이 기능을 사용하지 않으려면 고급 &gt; 네트워크 항상 검색으로 이동하세요."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"다시 표시 안함"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"절전 모드 동안 Wi-Fi 연결 유지"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"설정을 변경하는 중 문제가 발생했습니다."</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi 최적화"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Wi-Fi가 사용 중일 때 배터리 사용량 최소화"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 최적화"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Wi-Fi가 사용 중일 때 배터리 사용량 최소화"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"네트워크 추가"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 네트워크"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 네트워크"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 푸시 버튼"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"추가 옵션"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 입력"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"네트워크 연결"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"네트워크 저장 안함"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"네트워크 수정"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"사용 가능한 네트워크를 보려면 Wi-Fi를 켭니다."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Wi-Fi 네트워크를 찾는 중…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"사용 가능한 네트워크를 보려면 Wi-Fi를 켜세요."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi 네트워크를 찾는 중…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wi‑Fi 네트워크를 변경할 권한이 없습니다."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"다른 네트워크…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"더보기"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"자동 설정(WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"설정을 완료하려면 태블릿이 Wi-Fi에 액세스해야 합니다. 설정 후 모바일 데이터와 Wi-Fi 간에 전환할 수 있습니다."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"설정을 완료하려면 태블릿이 Wi-Fi에 액세스해야 합니다. 설정 후 모바일 데이터와 Wi-Fi 간에 전환할 수 있습니다."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"고급 옵션 표시"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</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="7204827509934892103">"공유기에서 Wi-Fi Protected 설정 버튼을 누르세요. \'WPS\'라고 줄여 부르기도 하며 다음 기호를 포함할 수도 있습니다."</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Wi-Fi 공유기에 PIN(개인 식별 번호) <xliff:g id="NUMBER">%1$s</xliff:g>을(를) 입력하세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"공유기에서 Wi-Fi Protected 설정 버튼을 누르세요. \'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="5754399645462924103">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS 설정이 이미 진행 중이며 완료하는 데 최대 2분이 소요됩니다."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS가 실패하였습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"무선 공유기 보안 설정(WEP)은 지원되지 않습니다."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"인증하지 못했습니다. 다시 시도하세요."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"다른 WPS 세션이 감지되었습니다. 잠시 후 다시 시도해 주세요."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"네트워크 SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID 입력"</string>
     <string name="wifi_security" msgid="6603611185592956936">"보안"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"신호 강도"</string>
     <string name="wifi_status" msgid="4824568012414605414">"상태"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</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_confirm_allow" msgid="5355973075896817232">"허용"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"거부"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"연결"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"네트워크 연결 실패"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"저장 안함"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"건너뛰지 않음"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"경고: 추가 이동통신 데이터 요금이 발생할 수 있습니다."\n\n"태블릿 설정은 상당한 네트워크 활동을 요구할 수 있습니다."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"경고: 추가 이동통신 데이터 요금이 발생할 수 있습니다."\n\n"휴대전화 설정은 상당한 네트워크 활동을 요구할 수 있습니다."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"경고: 태블릿으로 소프트웨어가 최신인지 여부를 확인할 수 없습니다."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"경고: 휴대전화로 소프트웨어가 최신인지 여부를 확인할 수 없습니다."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"해당 태블릿으로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"해당 휴대전화로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"고급 Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 주파수 대역"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"경고: 인터넷에 연결되어 있어야 태블릿에서 소프트웨어의 최신 상태 여부를 확인할 수 있습니다."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"경고: 인터넷에 연결되어 있어야 휴대전화에서 소프트웨어의 최신 상태 여부를 확인할 수 있습니다."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"해당 태블릿으로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"해당 휴대전화로 이 Wi-Fi 네트워크에 연결할 수 없습니다."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"고급 Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi 주파수 대역"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"작업에 대한 주파수 범위 지정"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"주파수 대역을 설정하는 동안 문제가 발생했습니다."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 주소"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"게이트웨이"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"네트워크 접두어 길이"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"기기 정보"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"이 연결 저장"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"기기 검색"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"이 그룹을 삭제할까요?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"휴대용 Wi-Fi 핫스팟"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"핫스팟 켜는 중…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"핫스팟 끄는 중…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"휴대용 핫스팟 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 사용"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"휴대용 Wi-Fi 핫스팟 오류"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi 핫스팟 설정"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"휴대용 Wi-Fi 핫스팟 오류"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"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="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"신호 강도"</string>
     <string name="status_roaming" msgid="2638800467430913403">"로밍"</string>
     <string name="status_operator" msgid="2274875196954742087">"네트워크"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 주소"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 주소"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"블루투스 주소"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"일련번호"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"사용할 수 없음"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 사용"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 사용 중지됨"</string>
     <string name="bearer" msgid="594270280031923558">"베어러(Bearer)"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO 유형"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO 값"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN 삭제"</string>
     <string name="menu_new" msgid="3014205883303921729">"새 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"저장"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"도움말"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"모바일 네트워크"</string>
     <string name="location_title" msgid="1029961368397484576">"사용자 위치"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi 및 모바일 네트워크 위치"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 및 모바일 네트워크 위치"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"사용자의 위치를 빠르게 예측하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 데이터가 수집되어 Google로 전송됩니다."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Wi-Fi에서 측정된 위치"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi에서 측정된 위치"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS 위성"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"앱이 사용자 태블릿의 GPS를 사용하여 사용자 위치를 파악하도록 함"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"앱이 사용자 휴대전화의 GPS를 사용하여 사용자 위치를 파악하도록 함"</string>
@@ -966,8 +990,8 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"서버를 사용하여 GPS 보조(GPS 성능을 개선하려면 선택 취소)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"위치 기반 Google 검색"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Google이 내 위치를 사용하여 검색결과 및 기타 서비스를 개선하도록 합니다."</string>
-    <string name="location_access_title" msgid="7064108942964081243">"내 위치에 대한 액세스 권한"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"사용자의 허가를 요청한 앱이 사용자의 위치 정보를 사용하도록 함"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"내 위치 정보 액세스"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"사용자의 허가를 요청한 앱이 위치 정보를 사용하도록 함"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"위치 소스"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"태블릿 정보"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"휴대전화 정보"</string>
@@ -976,10 +1000,10 @@
     <string name="contributors_title" msgid="5917703088825286504">"도움을 주신 분들"</string>
     <string name="regulatory_information" msgid="5695464367088752150">"규정 정보"</string>
     <string name="copyright_title" msgid="865906688917260647">"저작권"</string>
-    <string name="license_title" msgid="1990487604356037871">"라이센스"</string>
+    <string name="license_title" msgid="1990487604356037871">"라이선스"</string>
     <string name="terms_title" msgid="7697580845616764642">"약관"</string>
-    <string name="settings_license_activity_title" msgid="7553683406244228650">"오픈소스 라이센스"</string>
-    <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"라이센스를 로드하는 동안 문제가 발생했습니다."</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>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"안전 정보"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"필터"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"필터 옵션 선택"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"전체"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"사용중지됨"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"다운로드"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"실행 중"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 저장소"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"내장 앱을 사용 중지할 경우, 다른 앱에 오류가 발생할 수 있으며 데이터도 삭제될 수 있습니다."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"알림을 사용 중지하시겠습니까?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"이 앱에서 알림을 사용하도록 설정하지 않으면 중요한 알리미와 업데이트를 놓칠 수 있습니다."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"앱 운영"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"실행 중"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(사용 안 함)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"저장공간 사용량"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"앱에서 사용 중인 용량 보기"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"실행 중인 서비스"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"단어:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"바로가기:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"언어:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"단어 입력"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"선택적 단축키"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"단어 수정"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"수정"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"삭제"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"물리적 키보드 설정"</string>
     <string name="development_settings_title" msgid="215179176067683667">"개발자 옵션"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"앱 개발 옵션 설정"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"이 사용자는 개발자 옵션을 사용할 수 없습니다."</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 디버깅"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB가 연결된 경우 디버그 모드 사용"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"USB 디버깅 권한 승인 취소"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"전원 메뉴 버그 신고"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"전원 메뉴에 버그 신고 옵션 포함"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"켜진 상태로 유지"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"개발자 설정을 허용하시겠습니까?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"이 설정은 개발자용으로만 설계되었습니다. 이 설정을 사용하면 기기 및 애플리케이션에 예기치 않은 중단이나 오류가 발생할 수 있습니다."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB를 통해 설치된 앱 확인"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"전원 버튼으로 통화 종료"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"비밀번호 말하기"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"길게 누르기 지연"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"웹 접근성 향상"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"설정"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"사용"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"사용 안함"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"허용됨"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"허용되지 않음"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"허용"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"허용 안함"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>은(는) 비밀번호를 제외한 사용자가 입력한 모든 텍스트를 수집할 수 있습니다. 여기에는 신용카드 번호와 같은 개인정보도 포함됩니다. 또한 태블릿 사용과 관련한 데이터도 수집할 수 있습니다."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>은(는) 비밀번호를 제외하고 사용자가 입력한 모든 텍스트를 수집할 수 있습니다. 여기에는 신용카드 번호와 같은 개인정보도 포함됩니다. 또한 휴대전화 사용과 관련한 데이터도 수집할 수 있습니다."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 중지하시겠습니까?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"확인을 터치하면 <xliff:g id="SERVICE">%1$s</xliff:g>이(가) 중지됩니다."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"작업 살펴보기"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"앱과 상호작용할 때 알림을 받습니다."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 중지하시겠습니까?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"확인을 터치하면 <xliff:g id="SERVICE">%1$s</xliff:g>이(가) 중지됩니다."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"설치된 서비스가 없습니다."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"스크린 리더가 필요하십니까?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack은 시각 장애인을 위한 음성 피드백을 제공합니다. Android 마켓에서 무료로 설치하시겠습니까?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"앱에 Google에서 제공하는 스크립트를 설치하도록 허용하시겠습니까? 설치하면 웹 콘텐츠에 더 쉽게 액세스할 수 있습니다."</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"제공된 설명이 없습니다."</string>
     <string name="settings_button" msgid="3006713718908152930">"설정"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"배터리"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"충전 중"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"화면 켜짐"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS 사용"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"켜짐"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"모바일 네트워크 신호"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"장치 무중단 가동 시간"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi 사용 시간"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi 사용 시간"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 사용 시간"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 사용 시간"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"기록 세부정보"</string>
     <string name="details_title" msgid="3792801565213935385">"사용 세부정보"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"전원 사용 조절"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"포함된 패키지"</string>
     <string name="power_screen" msgid="3023346080675904613">"화면"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"블루투스"</string>
     <string name="power_cell" msgid="6596471490976003056">"대기 소모 전력"</string>
     <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 포그라운드"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"켜진 상태로 유지"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi 실행 중"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 실행 중"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"태블릿"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"휴대전화"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"보낸 데이터"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"앱 정보"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"앱 설정"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"화면 설정"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 설정"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi 설정"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"블루투스 설정"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"음성 통화에서 배터리 사용"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"태블릿이 유휴 상태일 때 배터리 사용"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"통화 불가능 지역에서는 전원을 절약하도록 비행 모드로 전환"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"디스플레이 및 백라이트에서 배터리 사용"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"화면 밝기 및/또는 화면 시간제한 줄이기"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi에서 배터리 사용"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"사용 중이 아니거나 사용할 수 없을 때 Wi-Fi 끄기"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi에서 배터리 사용"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"사용 중이 아니거나 사용할 수 없을 때 Wi-Fi 끄기"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"블루투스 배터리 사용량"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"사용 중이 아닐 때에는 블루투스 끄기"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"다른 블루투스 기기로 연결 시도"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"구성"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"다른 엔진 선택"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"이 음성 합성 엔진은 비밀번호와 신용카드 번호 등의 개인 데이터를 비롯한 모든 음성 데이터를 수집할 수 있습니다. 이것은 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 엔진의 기능입니다. 음성 합성 엔진을 사용하도록 설정하시겠습니까?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"이 언어로 TTS(Text-to-speech)를 출력하려면 네트워크 연결이 작동해야 합니다."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"엔진"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 설정"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 사용"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"기본 엔진"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"기본설정"</string>
     <string name="gadget_title" msgid="5519037532720577836">"전원 컨트롤"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi 설정 업데이트"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi 설정 업데이트"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"블루투스 설정 업데이트"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"켜짐"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"꺼짐"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"켜는 중"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"끄는 중"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"블루투스"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"동기화"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"모든 인증서 삭제"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"저장공간 유형"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"하드웨어 지원"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"소프트웨어 전용"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"백업 및 복원"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"개인 데이터"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"내 데이터 백업"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"앱 데이터, Wi-Fi 비밀번호 및 기타 설정을 Google 서버에 백업"</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="auto_restore_title" msgid="5397528966329126506">"자동 복원"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"새 비밀번호와 확인한 비밀번호가 일치하지 않습니다."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"백업 비밀번호를 설정하지 못함"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wi-Fi 비밀번호, 북마크, 기타 설정 및 앱 데이터 백업을 중지하고 Google 서버에 있는 모든 사본을 지우시겠습니까?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Wi-Fi 비밀번호, 북마크, 기타 설정 및 앱 데이터 백업을 중지하고 Google 서버에 있는 모든 사본을 지우시겠습니까?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"기기 관리 설정"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"기기 관리자"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"비활성화"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"알림"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"전화 벨소리 및 진동"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"시스템"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi 설정"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결 중..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi 설정"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결 중..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"네트워크 추가"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"연결되지 않음"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"네트워크 추가"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"연결 중..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"다음 단계로 이동"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP는 지원되지 않습니다."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"설정하는 동안에는 EAP Wi-Fi 연결을 구성할 수 없습니다. 설정한 후에 설정 &gt; 무선 및 네트워크에서 구성할 수 있습니다."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"설정하는 동안에는 EAP Wi-Fi 연결을 구성할 수 없습니다. 설정한 후에 설정 &gt; 무선 및 네트워크에서 구성할 수 있습니다."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"연결 시 몇 분 정도 걸릴 수 있습니다."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요."\n\n"다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요."\n\n"다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"동기화 사용"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"동기화 사용중지됨"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"동기화 오류입니다."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"디버깅된 애플리케이션이 실행되기 전에 디버거 연결을 위해 대기"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"입력"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"그림"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"하드웨어 가속 렌더링"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"모니터링"</string>
     <string name="strict_mode" msgid="1938795874357830695">"엄격 모드 사용"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"앱이 기본 스레드에서 오래 작업하면 화면 깜박이기"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"오버드로가 적은 순으로: 파란색, 녹색, 옅은 빨간색, 빨간색"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW 오버레이 사용 안함"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"추적 사용"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"추적 사용 선택"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"현재 사용하도록 설정된 추적 없음"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"현재 추적 <xliff:g id="NUM">%1$d</xliff:g>개를 사용할 수 있습니다."</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"현재 모든 추적을 사용할 수 있습니다."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL 추적 사용 설정"</string>
     <string name="debug_layout" msgid="5981361776594526155">"레이아웃 범위 표시"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"클립 경계, 여백 등을 표시"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"2D 드로잉용으로 GPU 강제 사용"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA 강제 사용"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"OpenGL ES 2.0 앱에서 4x MSAA 사용"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"사각형이 아닌 클립 작업 디버그"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"프로필 GPU 렌더링"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"adb shell dumpsys gfxinfo에서 렌더링 시간 측정"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"창 애니메이션 배율"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"전환 애니메이션 배율"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator 길이 배율"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"백그라운드 프로세스 수 제한"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"모든 ANR 보기"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"백그라운드 앱에 대해 앱 응답 없음 대화상자 표시"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"시험용 WebView 사용"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"앱에서 최신(베타) WebView를 사용합니다."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"데이터 사용량"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"데이터 사용 주기"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"데이터 로밍"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"백그라운드 데이터 제한"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G 사용 구분"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi 사용량 표시"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wi-Fi 사용량 표시"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"이더넷 사용량 표시"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"모바일 핫스팟"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"데이터 자동 동기화"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"모바일 데이터 제한 설정"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G 데이터 제한 설정"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G 데이터 제한 설정"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Wi-Fi 데이터 제한 설정"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wi-Fi 데이터 제한 설정"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"이더넷"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"모바일"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"태블릿을 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"지정된 한도에 도달하면 모바일 데이터 연결 사용이 중지됩니다."\n\n"휴대전화를 기준으로 데이터 사용량이 측정되며 이동통신사에서는 사용량을 다르게 계산할 수 있으므로 한도를 최대한 낮춰 사용하세요."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"백그라운드 데이터 사용을 제한하시겠습니까?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"백그라운드 모바일 데이터를 제한하는 경우 Wi-Fi 네트워크에 연결되지 않으면 일부 앱 및 서비스가 작동하지 않습니다."\n\n"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"경고"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"한도"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"삭제된 앱"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨 - 태블릿을 기준으로 측정된 데이터 사용량이며 이동통신사에서는 사용량을 다르게 계산할 수 있습니다."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: 약 <xliff:g id="TOTAL">%1$s</xliff:g> 사용됨 - 휴대전화를 기준으로 측정된 데이터 사용량이며 이동통신사에서는 사용량을 다르게 계산할 수 있습니다."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"모바일 핫스팟"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"모바일 핫스팟인 Wi-Fi 네트워크를 선택하세요. 앱이 백그라운드에 있을 때 해당 네트워크를 사용할 수 없도록 제한할 수 있습니다. 또한 앱에서 대용량 다운로드 전에 네트워크 사용에 대해 경고해 줍니다."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"모바일 핫스팟인 Wi-Fi 네트워크를 선택하세요. 앱이 백그라운드에 있을 때 해당 네트워크를 사용할 수 없도록 제한할 수 있습니다. 또한 앱에서 대용량 다운로드에 대해 네트워크 사용 전에 경고할 수도 있습니다."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"모바일 네트워크"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 네트워크"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"모바일 핫스팟을 선택하려면 Wi-Fi를 사용하도록 설정합니다."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi 네트워크"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"모바일 핫스팟을 선택하려면 Wi-Fi를 사용하도록 설정합니다."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"긴급 전화"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"통화로 돌아가기"</string>
     <string name="vpn_name" msgid="4689699885361002297">"이름"</string>
@@ -1781,9 +1811,9 @@
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"시스템 CA 인증서를 사용 중지하시겠습니까?"</string>
     <string name="trusted_credentials_remove_confirmation" msgid="443561923016852941">"사용자 CA 인증서를 영구 삭제하시겠습니까?"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"맞춤법 검사기"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"여기에 전체 백업에 대한 현재 사용중인 비밀번호를 입력하세요."</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"여기에 전체 백업에 대한 새 비밀번호를 입력하세요."</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"여기에 전체 백업에 대한 새 비밀번호를 다시 입력하세요."</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"전체 백업에 대한 현재 사용중인 비밀번호를 입력하세요."</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"전체 백업에 대한 새 비밀번호를 입력하세요."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"전체 백업에 대한 새 비밀번호를 다시 입력하세요."</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"백업 비밀번호 설정"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"취소"</string>
     <string name="percentage" msgid="5866131581207788624">"<xliff:g id="NUMBER">%d</xliff:g>%%"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"허가"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"시행"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"사용자"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"나"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"다른 사용자"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"사용자 추가"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"활성"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"비활성"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"사용자 및 프로필"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"사용자 또는 프로필 추가"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"제한된 프로필"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"제한된 프로필을 만들기 전에 화면 잠금을 설정하여 앱과 개인 데이터를 보호해야 합니다."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"잠금 설정"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"설정되지 않음"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"설정되지 않음 - 제한된 프로필"</string>
     <string name="user_owner" msgid="3879126011135546571">"소유자"</string>
+    <string name="user_you" msgid="1639158809315025986">"나(<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"닉네임"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"추가"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"사용자는 자신의 앱과 콘텐츠를 보유합니다."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"내 계정의 앱 및 콘텐츠에 대한 액세스를 제한할 수 있습니다."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"사용자"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"제한된 프로필"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"새 사용자 추가"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"새로운 사용자를 추가로 만들어서 이 기기를 공유할 수 있습니다. 각 사용자는 별도의 공간을 갖게 되며 내 앱, 배경화면 등을 맞춤설정할 수 있습니다. 사용자는 또한 모두에게 영향을 주는 Wi-Fi와 같은 태블릿 설정을 조정할 수 있습니다."\n\n"새로운 사용자를 만든 후에 해당 사용자는 설정 과정을 진행해야 합니다."\n\n"모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"새로운 사용자를 추가로 만들어서 이 기기를 공유할 수 있습니다. 각 사용자는 별도의 공간을 갖게 되며 내 앱, 배경화면 등을 맞춤설정할 수 있습니다. 사용자는 또한 모두에게 영향을 주는 Wi-Fi와 같은 태블릿 설정을 조정할 수 있습니다."\n\n"새로운 사용자를 만든 후에 해당 사용자는 설정 과정을 진행해야 합니다."\n\n"모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"새로운 사용자를 만들면 해당 사용자의 설정 과정을 진행해야 합니다."\n\n"모든 사용자는 다른 사용자들을 대신하여 업데이트된 앱 권한을 승인할 수 있습니다."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"지금 사용자를 설정하시겠습니까?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"사용자가 태블릿을 사용하여 자신의 공간을 설정할 수 있는지 확인하세요."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"지금 프로필을 설정하시겠습니까?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"지금 설정"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"나중에"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"태블릿의 소유자만 사용자를 관리할 수 있습니다."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"휴대전화의 소유자만 사용자를 관리할 수 있습니다."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"제한된 프로필은 계정을 추가할 수 없습니다."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"이 기기에서 <xliff:g id="USER_NAME">%1$s</xliff:g>님 삭제"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"새 사용자"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"새 프로필"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"본인을 삭제하시겠습니까?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"사용자를 삭제하시겠습니까?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"프로필을 삭제하시겠습니까?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"이 태블릿에 있는 내 저장 공간 및 데이터가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"이 휴대전화에 있는 내 저장 공간 및 데이터가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"이 사용자의 저장 공간 및 데이터가 이 태블릿에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"이 사용자의 저장 공간 및 데이터가 이 휴대전화에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"이 프로필의 저장 공간 및 데이터가 이 태블릿에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"이 프로필의 저장 공간 및 데이터가 이 휴대전화에서 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"새 사용자 추가 중..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"사용자 삭제"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"삭제"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"앱 및 콘텐츠 허용"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"애플리케이션 제한"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"애플리케이션을 위한 설정 확장"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"이 설정은 태블릿의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"이 설정은 휴대전화의 모든 사용자에게 영향을 줍니다."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"언어 변경"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"셀 브로드캐스트"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"표시할 긴급 알림 유형을 선택합니다."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"애플리케이션 및 콘텐츠 제한"</string>
+    <string name="user_rename" msgid="8523499513614655279">"이름 바꾸기"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"애플리케이션 한도 설정"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"블루투스 페어링 및 설정을 수정하도록 허용"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"태블릿이 다른 기기와 접촉하면 데이터 교환 허용"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"휴대전화가 다른 기기와 접촉하면 데이터 교환 허용"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"위치 정보 액세스"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"앱에서 위치 정보를 사용하도록 허용"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"뒤로"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"다음"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"완료"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"사진 촬영"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"갤러리에서 사진 선택"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index f58bca0..2fde167 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lėtas"</item>
     <item msgid="1145554631248513562">"Įprastas"</item>
     <item msgid="7553665153391107454">"Greitas"</item>
-    <item msgid="2538100882620724753">"Labai greitai"</item>
+    <item msgid="1370673569131070146">"Greitesnis"</item>
+    <item msgid="4648206845228970803">"Labai greitas"</item>
+    <item msgid="4977949754169483251">"Spartus"</item>
+    <item msgid="6106302964845503577">"Labai spartus"</item>
+    <item msgid="6800277205640837264">"Greičiausias"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Visiškai senka"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nieko"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nėra"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nenurodyta"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Jokių"</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">"Vidinė įrenginio saugykla"</item>
     <item msgid="3738430123799803530">"Keičiama SD kortelė"</item>
     <item msgid="4498124044785815005">"Leisti nuspręsti sistemai"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Vieta"</item>
+    <item msgid="255608127647030286">"Asmeninės"</item>
+    <item msgid="4588829735729884491">"Susirašinėjimas žinutėmis"</item>
+    <item msgid="8971765125227378270">"Įrenginys"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"apytikslė vietovė"</item>
+    <item msgid="5789673140227507995">"tiksli vietovė"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibruoti"</item>
+    <item msgid="3434165993711230924">"skaityti kontaktus"</item>
+    <item msgid="616161687718081936">"keisti kontaktus"</item>
+    <item msgid="7638002295329050091">"skaityti skambučių žurnalą"</item>
+    <item msgid="6546959730920410907">"keisti skambučių žurnalą"</item>
+    <item msgid="446877710771379667">"skaityti kalendorių"</item>
+    <item msgid="7674458294386319722">"keisti kalendorių"</item>
+    <item msgid="8281201165558093009">"„Wi-Fi“ žvalgymas"</item>
+    <item msgid="8694611243479480497">"pranešimas"</item>
+    <item msgid="7776439107987345446">"mobiliųjų telefonų žvalgymas"</item>
+    <item msgid="514615766544675057">"skambinti į telefoną"</item>
+    <item msgid="8181415497109310680">"skaityti SMS"</item>
+    <item msgid="6816551144382117307">"rašyti SMS"</item>
+    <item msgid="4600463921908905030">"gauti SMS"</item>
+    <item msgid="5958926493289432745">"gauti nepaprastosios padėties SMS"</item>
+    <item msgid="4945269495221089540">"gauti MMS"</item>
+    <item msgid="5570472453573929087">"gauti „WAP Push“ pranešimus"</item>
+    <item msgid="7125408150230860501">"siųsti SMS"</item>
+    <item msgid="7080337936612188061">"skaityti ICC SMS"</item>
+    <item msgid="587124103118495063">"rašyti ICC SMS"</item>
+    <item msgid="2320577158869025503">"keisti nustatymus"</item>
+    <item msgid="1545733463471924009">"piešti viršuje"</item>
+    <item msgid="3609046903962454582">"pasiekti pranešimus"</item>
+    <item msgid="4671646036128214513">"fotoaparatas"</item>
+    <item msgid="1097324338692486211">"įrašyti garso įrašą"</item>
+    <item msgid="5031552983987798163">"leisti garso įrašą"</item>
+    <item msgid="8374996688066472414">"skaityti iškarpinę"</item>
+    <item msgid="3045529469061083747">"keisti iškarpinę"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Vietovė"</item>
+    <item msgid="8677040780775113033">"Vietovė"</item>
+    <item msgid="1660743989948992916">"Vietovė"</item>
+    <item msgid="8791172739860195290">"Vibruoti"</item>
+    <item msgid="383413555642128046">"Skaityti kontaktus"</item>
+    <item msgid="3654594895269697313">"Keisti kontaktus"</item>
+    <item msgid="7928393476362362538">"Skaityti skambučių žurnalą"</item>
+    <item msgid="6248591205254641116">"Keisti skambučių žurnalą"</item>
+    <item msgid="6093344633066170692">"Skaityti kalendorių"</item>
+    <item msgid="1334886368750347692">"Keisti kalendorių"</item>
+    <item msgid="1638204101698708656">"Vietovė"</item>
+    <item msgid="2154671955760380322">"Paskelbti pranešimą"</item>
+    <item msgid="4282477730595931828">"Vietovė"</item>
+    <item msgid="4891423912898525905">"Skambinti į telefoną"</item>
+    <item msgid="626463821668200388">"Gauti SMS / MMS"</item>
+    <item msgid="1237538540368797101">"Siųsti SMS / MMS"</item>
+    <item msgid="3986142739951490025">"Gauti SMS / MMS"</item>
+    <item msgid="3984213795861739778">"Gauti SMS / MMS"</item>
+    <item msgid="3656243523752472788">"Gauti SMS / MMS"</item>
+    <item msgid="8105802370238551510">"Gauti SMS / MMS"</item>
+    <item msgid="1407766984645388488">"Siųsti SMS / MMS"</item>
+    <item msgid="1530132603376027248">"Gauti SMS / MMS"</item>
+    <item msgid="1188256962149204607">"Siųsti SMS / MMS"</item>
+    <item msgid="4218544235221631789">"Keisti nustatymus"</item>
+    <item msgid="736541391767350377">"Piešti viršuje"</item>
+    <item msgid="5530815681721654194">"Pasiekti pranešimus"</item>
+    <item msgid="781213371706962767">"Fotoaparatas"</item>
+    <item msgid="1720492593061838172">"Įrašyti garso įrašą"</item>
+    <item msgid="3493046322001257041">"Leisti garso įrašą"</item>
+    <item msgid="136815868796597058">"Skaityti iškarpinę"</item>
+    <item msgid="5238692940326972503">"Keisti iškarpinę"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Trumpas"</item>
     <item msgid="2560532955514699713">"Vidutinis"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"„Systrace“ (grafika)"</item>
     <item msgid="1340692776955662664">"Kreipinių dėklas „glGetError“"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Išjungta"</item>
+    <item msgid="675719912558941285">"Piešti ne stačiak. reg. mėlyna sp."</item>
+    <item msgid="1064373276095698656">"Paryš. išban. pieš. kom. žalia sp."</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Išjungta"</item>
+    <item msgid="2751513398307949636">"Ekrane (stulpeliai)"</item>
+    <item msgid="8272260411216018353">"Ekrane (linijos)"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standartinis apribojimas"</item>
     <item msgid="4071574792028999443">"Nėra fono procesų"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 299f250..5a122c8 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Lėktuvo režimas"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Daugiau…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bevielis ryšys ir tinklai"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Valdyti „Wi-Fi“, „Bluetooth“, lėktuvo režimą, mobilius tinklus, ir VPT"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Tvarkyti „Wi-Fi“, „Bluetooth“, lėktuvo režimą, mobiliuosius tinklus ir VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Tarptinklinis duomenų ryšys"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Veikiant tarptinkliniam ryšiui, prisijungti prie duomenų paslaugų"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Įveskite tekstą, pateiktiną užrakinimo ekrane"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Rodyti naudotojo informaciją užrakinimo ekrane"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Naudotojo inform."</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Rodyti profilio informaciją užrakinimo ekrane"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilio informacija"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Vietovės prieiga"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sauga"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Įrenginio administravimas"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Įrenginio administratoriai"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Žiūrėti arba išaktyvinti įrenginio administratorius"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Prieiga prie pranešimų"</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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Įjungti „Bluetooth“"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Atsiminti nustatymus"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Belaidis rodymas"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Jei norite matyti įrenginius, įjunkite belaidį rodymą."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Belaidis rodymas neleidžiamas, nes „Wi-Fi“ išjungta."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Belaidžio ryšio pateiktis neleidžiama, nes „Wi-Fi“ išjungta."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Ieškoti pateikčių"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Ieškoma…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nerasta belaidžio ryšio pateikčių netol."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Kai ši funkcija įjungta, galite programos turinį perduoti į kitą ALR palaikantį įrenginį laikydami du įrenginius šalia. Pavyzdžiui, galite perduoti Naršyklės puslapius, „YouTube“ vaizdo įrašus, žmonių kontaktus ir daugiau."\n\n"Tiesiog sudėkite du įrenginius vieną šalia kito (suglaudę galinėmis dalimis) ir palieskite ekraną. Programa nustato, kas bus perduodama."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Tinklo paslaugos aptikimas"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Leisti kitų įrenginių programoms aptikti šio įrenginio programas"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Įjungti „Wi-Fi“"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"„Wi-Fi“ nustatymai"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Įjungti „Wi-Fi“"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"„Wi-Fi“ nustatymai"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Pasirinkti „Wi-Fi“"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Įjungti „Wi-Fi“?"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Išjungiamas „Wi-Fi“..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pasirinkti „Wi-Fi“"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"„Wi-Fi“ įjungiama…"</string>
+    <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="3038290727701553612">"Pranešti, kai bus galimas atviras tinklas"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vengti prasto ryšio"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Išlaikyti „Wi-Fi“, kai veikia miego režimas"</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_scan_always_available" msgid="3470564139944368030">"Nuskaitymas visada pasiekiamas"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Leisti „Google“ vietovių paslaugai ir kitoms programoms nuskaityti tinklus, net kai „Wi-Fi“ išjungtas"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Įdiegti sertifikatus"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Kad patobulintumėte vietovių tikslumą ir kitais tikslais, leiskite „Google“ vietovių paslaugai ir kitoms programoms ieškoti netoliese esančių „Wi-Fi“ tinklų, net jei „Wi-Fi“ išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programos gali ieškoti netoliese esančių tinklų, net kai „Wi-Fi“ yra išjungtas. Jei nenorite, kad būtų ieškoma, eikite į skiltį „Išplėstiniai“ &gt; „Visada galima ieškoti“."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Daugiau neberodyti"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Išlaikyti „Wi-Fi“ įjungtą, kai veikia miego režimas"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Keičiant nustatymą kilo problemų"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"„Wi-Fi“ optimizavimas"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Sumažinti akumuliatoriaus naudojimą, kai „Wi-Fi“ įjungta"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"„Wi-Fi“ optimizavimas"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Sumažinti akumuliatoriaus naudojimą, kai „Wi-Fi“ įjungta"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridėti tinklą"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"„Wi-Fi“ tinklai"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"„Wi-Fi“ tinklai"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS paspaudimo mygt."</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Daugiau parinkčių"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN kodo įrašas"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Tiesiog. „Wi-Fi“ r."</string>
+    <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_connect" msgid="4996220309848349408">"Prijungti prie tinklo"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pamiršti tinklą"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Keisti tinklą"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Jei norite peržiūrėti pasiekiamus tinklus, įjunkite „Wi-Fi“."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Ieškoma „Wi-Fi“ ryšio tinklų…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kad peržiūrėt. galimus tinklus, įjunkite „Wi-Fi“."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ieškoma „Wi-Fi“ tinklų…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Neturite leidimo keisti „Wi‑Fi“ tinklą."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Kitas tinklas…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Daugiau"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatinė sąranka (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Kad užbaigtumėte sąranką, planšetiniam kompiuteriui reikalinga prieiga prie „Wi-Fi“. Baigę sąranką galėsite perjungti iš mobiliojo ryšio duomenų į „Wi-Fi“ ir atvirkščiai."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Kad užbaigtumėte sąranką, planšetiniam kompiuteriui turi būti suteikta prieiga prie „Wi-Fi“. Baigę sąranką galėsite perjungti iš mobiliojo ryšio duomenų į „Wi-Fi“ ir atvirkščiai."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rodyti išplėstines parinktis"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Apsaugota „Wi-Fi“ sąranka"</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="7204827509934892103">"Maršruto parinktuve paspauskite mygtuką „Wi-Fi“ apsaugota sąranka“. Jis gali būti pavadintas WPS arba nurodytas šis simbolis:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Į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_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_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="5754399645462924103">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS jau vykdoma ir gali užtrukti iki dviejų minučių, kol bus baigta."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neįvykdyta. Po kelių minučių bandykite dar kartą."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Belaidžio maršruto parinktuvo saugos nustatymas (WEP) nepalaikomas"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Nepavyko autentifikuoti. Bandykite dar kartą."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Aptikta kita WPS sesija. Po kelių minučių bandykite dar kartą."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Tinklo SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Įveskite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sauga"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalo stiprumas"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Būsena"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</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\n"Ar norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Atmesti"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Prijungti"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pamiršti"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nepraleisti"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ĮSPĖJIMAS: gali būti taikomi papildomi operatoriaus duomenų mokesčiai."\n\n"Nustatant planšetinį kompiuterį gali reikėti daug naudoti tinklą."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ĮSPĖJIMAS: gali būti taikomi papildomi operatoriaus duomenų mokesčiai."\n\n"Nustatant telefoną gali reikėti daug naudoti tinklą."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ĮSPĖJIMAS: planšetinis kompiuteris negalės patvirtinti, kad programinė įranga yra atnaujinta."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ĮSPĖJIMAS: telefonas negalės patvirtinti, kad programinė įranga yra atnaujinta."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Planšetiniam kompiuteriui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Išplėstinis „Wi-Fi“"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"„Wi-Fi“ dažnių juosta"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ĮSPĖJIMAS: planšetinis kompiuteris galės patvirtinti, kad naudojama naujausia programinė įranga, tik kai bus pasiekiamas interneto ryšys."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ĮSPĖJIMAS: telefonas galės patvirtinti, kad naudojama naujausia programinė įranga, tik kai bus pasiekiamas interneto ryšys."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetiniam kompiuteriui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonui nepavyko prisijungti prie šio „Wi-Fi“ tinklo."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Išplėstinis „Wi-Fi“"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"„Wi-Fi“ dažnių juosta"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Nurodyti veikimo dažnumą"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Nustatant dažnių juostą iškilo problema."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresas"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Tinklų sietuvas"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tinklo kodo ilgis"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Tiesioginis „Wi-Fi“ ryšys"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Tiesiog. „Wi-Fi“ r."</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Įrenginio informacija"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Atsiminti šį ryšį"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Ieškoti įrenginių"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Atšaukti kvietimą?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ar norite atšaukti kvietimą prisijungti prie <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Pamiršti šią grupę?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Kilnojamasis „Wi-Fi“ viešosios interneto prieigos taškas"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Įjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Išjungiamas viešosios interneto prieigos taškas…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Perkeliama aktyvioji sritis <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvi"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Perkeliamos „Wi-Fi“ aktyviosios srities klaida"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> perkeliama „Wi-Fi“ aktyvioji sritis"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kilnojamojo „Wi-Fi“ viešosios interneto prieigos taško klaida"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</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="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signalo stiprumas"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Tarptinklinis ryšys"</string>
     <string name="status_operator" msgid="2274875196954742087">"Tinklas"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"„Wi-Fi“ „MAC“ adresas"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"„Wi-Fi“ MAC adresas"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"„Bluetooth“ adresas"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijos numeris"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Užimtas (-a)"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN įgalinta"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN neleidžiama"</string>
     <string name="bearer" msgid="594270280031923558">"Nešiklis"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO tipas"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO vertė"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Ištrinti APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Naujas APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Išsaugoti"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pagalba"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilūs tinklai"</string>
     <string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"„Wi-Fi“ ir mob. tinklo vietov."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"„Wi-Fi“ ir mob. tinklo 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="7457348712272184793">"Vietą nustatė „Wi-Fi“"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vietą nustatė „Wi-Fi“"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS palydovai"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Leisti programoms naudoti GPS planšetiniame kompiuteryje jūsų vietovei nustatyti"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Leisti programoms naudoti GPS telefone jūsų vietovei nustatyti"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtruoti"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pasirinkti filtro parinktis"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Visi"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Neleidžiama"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Atsisiųsta"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Vykdoma"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB atmintinė"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Jei neleisite integruotos programos, kitos programos gali veikti netinkamai. Be to, duomenys bus ištrinti."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Išjungti pranešimus?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jei išjungsite šios programos pranešimus, galite praleisti svarbius įspėjimus ir naujinius."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Programos operacijos"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Vykdoma"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Niekada nenaudota)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Atmintinės naudojimas"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Žiūrėti programų naudojamą atmintinę"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Vykdomos paslaugos"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Žodis:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Spartusis klavišas:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Kalba:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Įveskite žodį"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Pasirenkamas spartusis klavišas"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redaguoti žodį"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redaguoti"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ištrinti"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fizinės klaviatūros nustatymai"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Kūrėjo parinktis"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Nustatyti programos kūrimo parinktis"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Kūrėjo parinktys negalimos šiam naudotojui"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB perkrova"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Derinimo režimas, kai prijungtas USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Panaikinti USB derinimo prieigos teises"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Įjungimo meniu pranešimai apie triktis"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Įtraukti parinktį į įjungimo meniu, kad būtų galima pranešti apie triktį"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Veikti"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Leisti kūrėjų nustatymus?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Šie nustatymai skirti tik kūrėjams. Nustačius juos įrenginys ir jame naudojamos programos gali nustoti veikti arba veikti netinkamai."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Patvirtinti progr. naudojant USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrano didinimas"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automat. atnaujinti ekrano didinimą"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atnaujinti ekrano didinimą perkeliant programas"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Maitinimo mygt. baigiamas skambutis"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Maitinimo mygt. baig. skamb."</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sakyti slaptažodžius"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"„Paliesti ir laikyti“ delsa"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Žiniat. pritaik. neįgal. išplėtimas"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nustatymai"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Įjungta"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Išjungta"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Leidžiama"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Neleidžiama"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Leisti"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Neleisti"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Naudoti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"„<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>“ gali rinkti visą jūsų įvedamą tekstą, išskyrus slaptažodžius. Tai apima ir asmeninius duomenis, pvz., kredito kortelės numerius. Ji taip pat gali rinkti duomenis apie jūsų sąveiką su planšetiniu kompiuteriu."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"„<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>“ gali rinkti visą įvedamą tekstą, išskyrus slaptažodžius. Tai apima ir asmeninius duomenis, pvz., kredito kortelės numerius. Ji taip pat gali rinkti duomenis apie jūsų sąveiką su telefonu."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Stabdyti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Palietus „Gerai“ bus sustabdyta „<xliff:g id="SERVICE">%1$s</xliff:g>“."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Stebėti jūsų veiksmus"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Gauti pranešimus, kai sąveikaujate su programa."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Sustabdyti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Palietus „Gerai“ bus sustabdyta „<xliff:g id="SERVICE">%1$s</xliff:g>“."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nėra įdiegta jokių paslaugų"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Reikia ekrano skaitytuvo?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"„TalkBack“ teikia atsiliepimus žodžiu, kad padėtų akliems ir sutrikusio regėjimo naudotojams. Ar norite nemokamai įdiegti šią funkciją iš „Android“ prekyvietės?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ar norite programose įdiegti scenarijus iš „Google“, kurie padarytų jų turinį geriau pasiekiamą?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nepateikta jokių aprašų."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nustatymai"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Kraunama"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekranas įjungtas"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GSP įjungta"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Pažadinti"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mob. ryšio tinklo signal."</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Įrenginio veikimo laikas"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"„Wi-Fi“ laiku"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"„Wi-Fi“ laiku"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"„Wi-Fi“ laiku"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"„Wi-Fi“ laiku"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Istorijos informacija"</string>
     <string name="details_title" msgid="3792801565213935385">"Išsami naudojimo informacija"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Reguliuoti maitinimo naudojimą"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Įtraukti paketai"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekranas"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"„Wi-Fi“"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilusis telefonas veikia laukimo režimu"</string>
     <string name="power_phone" msgid="5392641106474567277">"Balso skambučiai"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU aktyvusis langas"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neužmigdyti"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"„Wi-Fi“ vykdoma"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"„Wi-Fi“ vykdoma"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Planšetinis kompiuteris"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefonas"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Duomenys išsiųsti"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Programos informacija"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Programos nustatymai"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ekrano nustatymai"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"„Wi-Fi“ nustatymai"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"„Wi-Fi“ nustatymai"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"„Bluetooth“ nustatymai"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Balso skambučių akumuliatoriaus naudojimas"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Akumuliatorius naudojamas, kai planšetinis kompiuteris yra neveikos būsenos"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Pereiti prie lėktuvo režimo, norint taupyti energiją srityse, kuriose nėra"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Akumuliatorių naudoja pateiktis ir foninis apšvietimas"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Sumažinti ekrano šviesumą ir (arba) ekrano skirtąjį laiką"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"„Wi-Fi“ naudojamas akumuliatorius"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Išjungti „Wi-Fi“, kai jis nenaudojamas arba negalimas"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"„Wi-Fi“ naudojamas akumuliatorius"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Išjungti „Wi-Fi“, kai nenaudojama arba nepasiekiama"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"„Bluetooth“ naudojamas akumuliatorius"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Išjungti „Bluetooth“, kai nenaudojate"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Bandyti prisijungti prie kito „Bluetooth“ įrenginio"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigūruoti"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pasirinkite kitą variklį"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Šis kalbos sintezės variklis gali rinkti visą įvedamą tekstą, įskaitant asmeninius duomenis, pvz., kredito kortelės numerius, išskyrus slaptažodžius. Tai vyksta dėl variklio <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Įgalinti šio kalbos sintezės variklio naudojimą?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Pasirinkus šią kalbą, teksto vertimo kalba išvesčiai būtinas veikiantis tinklo ryšys."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Varikliai"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> nustatymai"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> įgalinta"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Pageidaujamas variklis"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Bendra"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Maitinimo valdymas"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Atnaujinamas „Wi-Fi“ nustatymas"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atnaujinamas „Wi-Fi“ nustatymas"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atnaujinamas „Bluetooth“ nustatymas"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"įjungta"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"išjungta"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"įjungiama"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"išjungiama"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinchronizavimas"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Pašalinti visus sertifikatus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Patikimi įgaliojimai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Rodyti patikimus CA sertifikatus"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Atmintinės tipas"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Atsarginė kopija saugoma aparatinėje įrangoje"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Saugoma tik programinėje įrangoje"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nubrėžti atrakinimo piešinį"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Kurti atsarginę kopiją ir atkurti"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Asmeniniai duomenys"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Kurti atsarginę duomenų kopiją"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"„Google“ serveriuose kurti atsargines programos duomenų, „Wi-Fi“ slaptažodžių ir kitų nustatymų kopijas"</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="auto_restore_title" msgid="5397528966329126506">"Automatinis atkūrimas"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Naujas slaptažodis ir patvirtinimas neatitinka"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nustatant atsarginį slaptažodį įvyko klaida"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Nebekurti atsarginių „Wi-Fi“ slaptažodžių, žymių, kitų nustatymų ir programų duomenų kopijų ir ištrinti visas „Google“ serveriuose esančias kopijas?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Nebekurti atsarginių „Wi-Fi“ slaptažodžių, žymių, kitų nustatymų ir programų duomenų kopijų ir ištrinti visas „Google“ serveriuose esančias kopijas?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Įrenginio administravimo nustatymai"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Įrenginio administratorius"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Išaktyvinti"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Įspėjimai"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Skambinimo tonas ir vibracija"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"„Wi-Fi“ sąranka"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Prisijungti prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Jungiamasi prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"„Wi-Fi“ sąranka"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Prisijungti prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Prisijungiama prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pridėti tinklą"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Neprijungta"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pridėti tinklą"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Prisijungiama…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Atlikite kitą veiksmą"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nepalaikoma."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Negalite konfigūruoti EAP „Wi-Fi“ ryšio, kai vykdoma sąranka. Po sąrankos tai galite padaryti nuėję į „Nustatymai“ &gt; „Belaidis ryšys ir tinklai“."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Negalite konfigūruoti EAP „Wi-Fi“ ryšio, kai vykdoma sąranka. Po sąrankos tai galėsite padaryti skiltyje „Nustatymai“ &gt; „Belaidis ryšys ir tinklai“."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Prisijungimas gali užtrukti kelias minutes…"</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Jei norite tęsti sąranką, palieskite "<b>"Kitas"</b>"."\n\n"Jei norite prisijungti prie kito „Wi-Fi“ tinklo, palieskite "<b>"Atgal"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Palieskite "<b>"Kitas"</b>", kad tęstumėte sąranką."\n\n"Palieskite "<b>"Atgal"</b>", kad prisijungtumėte prie kito „Wi-Fi“ tinklo."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinchronizavimas įgalintas"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinchronizavimas neleidžiamas"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinchronizavimo klaida."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Derinta progr. laukia derint., kad galėtų tęsti."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Įvestis"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Atvaizdavimas"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Aparatinės įrangos paspartintas pateikimas"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Stebėjimas"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Įgal. griežtas režimas"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Ekr. blyksės, kai pr. atl. ilgus proc. pgr. gijoje"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Nuo ger. iki blog.: mėl., žalia, šv. raud., raud."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Neleisti HW perdangų"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Įgalinti pėdsakus"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Pasir. įgalintus pėdsakus"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Šiuo metu neįgalinta jokių pėdsakų"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Šiuo metu įgalinta pėdsakų: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Šiuo metu visi pėdsakai įgalinti"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Įgalinti „OpenGL“ pėdsak."</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rodyti išdėstymo ribas"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rodyti iškarpų ribas, kraštines ir t. t."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Priverstinai naudoti GPU atvaizduojant 2D formatą"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Priverst. vykdyti 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Įgalinti 4x MSAA „OpenGL ES 2.0“ programose"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Derinti ne stačiakampio klipo operacijas"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profiliuotas GPU atvaizd."</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Skaič. atvaizd. laiką „adb shell dumpsys gfxinfo“"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Lango animacijos mast."</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Fono procesų apribojimas"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Rodyti visus ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Fon. programose rodyti dialogo langą „Neatsako“"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Naudoti eksper. „Webview“"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Programos naudos naujausią (beta) „WebView“"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Duomenų naudojimas"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Duomenų naudojimo ciklas"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Tarptinklinis duomenų ryšys"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Fono duomenų ribojimas"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Atskirti 4G naudojimą"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Rodyti „Wi-Fi“ naudojimą"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Rodyti „Wi-Fi“ naudojimą"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Rodyti eterneto naudojimą"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mob. vieš. inter. prieig. tšk."</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatinis duomenų sinchronizavimas"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nustatyti mobiliųjų duomenų apribojimą"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nustatyti 4G duomenų apribojimą"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Nustatyti 2G–3G duomenų apribojimą"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Nustatyti „Wi-Fi“ duomenų apribojimą"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nust. „Wi-Fi“ duom. aprib."</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Eternetas"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilieji"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami planšetiniu kompiuteriu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobiliųjų duomenų ryšys bus neleidžiamas, kai bus pasiektas nurodytas apribojimas."\n\n"Kadangi sunaudoti duomenys skaičiuojami telefonu, o operatorius gali apskaičiuoti kitaip, apsvarstykite galimybę naudoti mažesnį apribojimą."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Apriboti foninius duomenis?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jei apribosite fono duomenis mobiliesiems, neveiks kai kurios programos ir paslaugos, nebent būsite prisijungę prie „Wi-Fi“ tinklo."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jei apribosite foninius mobiliojo ryšio duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas turi įtakos visiems šio planšetinio kompiuterio naudotojams."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jei apribosite foninius mobiliojo ryšio duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas taikomas visiems šio planšetinio kompiuterio naudotojams."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jei apribosite mobiliojo ryšio fono duomenis, kai kurios programos ir paslaugos neveiks, nebent prisijungsite prie „Wi-Fi“ tinklo."\n\n"Šis nustatymas taikomas visiems šio telefono naudotojams."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"įspėjimas"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"apribojimas"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Pašalintos programos"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: planš. komp. apskaič., kad sunaud. <xliff:g id="TOTAL">%1$s</xliff:g>. Operat. duomenis gali apskaič. kitaip."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: telef. apskaič., kad sunaudota <xliff:g id="TOTAL">%1$s</xliff:g>. Oper. sunaud. duom. gali apskaič. kitaip."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobil. vieš. inter. prieig. tšk."</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Pasirinkite „Wi-Fi“ tinklus, kurie yra mobiliojo ryšio viešosios interneto prieigos taškai. Programose galima apriboti šių tinklų naudojimą, kai jos veikia fone. Be to, programose gali būti įspėjama prieš naudojant šiuos tinklus dideliems kiekiams duomenų atsisiųsti."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Pasirinkite „Wi-Fi“ tinklus, kurie yra mobiliojo ryšio viešosios interneto prieigos taškai. Programose galima apriboti šių tinklų naudojimą, kai jos veikia fone. Be to, programose gali būti įspėjama prieš naudojant šiuos tinklus dideliems kiekiams duomenų atsisiųsti."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiliojo ryšio tinklai"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"„Wi-Fi“ tinklai"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Kad pasir. mob. ryšio vieš. intern. prieigos tašk., įj. „Wi-Fi“."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"„Wi-Fi“ tinklai"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Kad pasir. mob. ryšio vieš. intern. prieigos tašk., įj. „Wi-Fi“."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Skambutis pagalbos numeriu"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Grįžti prie skambučio"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Pavadinimas"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Negriežta"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Vykdoma"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Naudotojai"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Jūs"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Kiti naudotojai"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Pridėti naudotoją"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktyvus"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktyvus"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Naudotojai ir profiliai"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Pridėti naudotoją ar profilį"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ribotas profilis"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Prieš kuriant apribotą profilį reikės nustatyti ekrano užraktą, kad apsaugotumėte programas ir asmeninius duomenis."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nustatyti užraktą"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenustatyta"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nenustatytas – ribotas profilis"</string>
     <string name="user_owner" msgid="3879126011135546571">"Savininkas"</string>
+    <string name="user_you" msgid="1639158809315025986">"Jūs (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Slapyvardis"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Pridėti"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Naudotojai turi savo programas ir turinį"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Galite apriboti prieigą prie paskyros programų ir turinio"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Naudotojas"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ribotas profilis"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridėti naują naudotoją"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Galite bendrinti šį įrenginį su kitais žmonėmis kurdami papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira vieta, kurią jie gali tinkinti savo programomis, ekrano fonu ir pan. Be to, naudotojai gali koreguoti planšetinio kompiuterio nustatymus, pvz., „Wi-Fi“, kurie turi įtakos visiems."\n\n"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą."\n\n"Bet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Galite bendrinti šį įrenginį su kitais žmonėmis sukurdami papildomų naudotojų. Kiekvienam naudotojui suteikiama atskira vieta, kurią jie gali tinkinti savo programomis, ekrano fonu ir pan. Be to, naudotojai gali koreguoti planšetinio kompiuterio nustatymus, pvz., „Wi-Fi“, kurie turi įtakos visiems."\n\n"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą."\n\n"Bet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Sukūrus naują naudotoją, tas asmuo turi įvykdyti sąrankos procesą."\n\n"Bet kuris naudotojas gali priimti atnaujintų programų leidimus visų kitų naudotojų vardu."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Nustatyti naudotoją dabar?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Įsitikinkite, kad asmuo gali naudoti planšetinį kompiuterį ir nustatyti savo vietą"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nustatyti profilį dabar?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nustatyti dabar"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne dabar"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Tik planšetinio kompiuterio savininkas gali tvarkyti naudotojus."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Tik telefono savininkas gali tvarkyti naudotojus."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Apribotuose profiliuose negalima pridėti paskyrų"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ištrinti <xliff:g id="USER_NAME">%1$s</xliff:g> iš šio įr."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Naujas naudotojas"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Naujas profilis"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Ištrinti save?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Pašalinti naudotoją?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Pašalinti profilį?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Jūsų vieta ir duomenys dings iš šio planšetinio kompiuterio. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Jūsų vieta ir duomenys dings iš šio telefono. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Šio naudotojo vieta ir duomenys dings iš šio planšetinio kompiuterio. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Šio naudotojo vieta ir duomenys dings iš šio telefono. Šio veiksmo anuliuoti negalima."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Šio profilio vieta ir duomenys dings iš šio planšetinio kompiuterio. Šio veiksmo anuliuoti negalima."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Šio profilio vieta ir duomenys dings iš šio telefono. Šio veiksmo anuliuoti negalima."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Pridedamas naujas naudotojas…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Ištrinti naudotoją"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Ištrinti"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Šis nustatymas turi įtakos visiems šio planšetinio kompiuterio naudotojams."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis nustatymas turi įtakos visiems šio telefono naudotojams."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Keisti kalbą"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Tinklo transliacijos"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pasirinkite rodomų nepaprastųjų įspėjimų tipus."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Programų ir turinio apribojimai"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PERVARDYTI"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nustatyti programų ribas"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Leisti keisti „Bluetooth“ susiejimą ir nustatymus"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"ALR"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Leisti keistis duomenimis, kai planšetinis kompiuteris aptinka kitą įrenginį"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Leisti keistis duomenimis, kai telefonas aptinka kitą įrenginį"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Vietovės prieiga"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Leisti programoms naudoti vietovės informaciją"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Atgal"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Kitas"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Užbaigti"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Fotografuoti"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Pasirinkti nuotrauką iš galerijos"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index f5e50a8..444871e 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lēni"</item>
     <item msgid="1145554631248513562">"Normāli"</item>
     <item msgid="7553665153391107454">"Ātri"</item>
-    <item msgid="2538100882620724753">"Ļoti ātri"</item>
+    <item msgid="1370673569131070146">"Ātrāk"</item>
+    <item msgid="4648206845228970803">"Ļoti ātri"</item>
+    <item msgid="4977949754169483251">"Raiti"</item>
+    <item msgid="6106302964845503577">"Ļoti raiti"</item>
+    <item msgid="6800277205640837264">"Visātrāk"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Ļoti zems"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"Parole"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nav"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nav"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nav noteikts"</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">"Iekšējā ierīces krātuve"</item>
     <item msgid="3738430123799803530">"Izņemama SD karte"</item>
     <item msgid="4498124044785815005">"Ļaut sistēmai izlemt"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Atrašanās vieta"</item>
+    <item msgid="255608127647030286">"Privāti"</item>
+    <item msgid="4588829735729884491">"Ziņojumapmaiņa"</item>
+    <item msgid="8971765125227378270">"Ierīce"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"aptuvena atrašanās vieta"</item>
+    <item msgid="5789673140227507995">"precīza atrašanās vieta"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrozvans"</item>
+    <item msgid="3434165993711230924">"lasīt kontaktpersonas"</item>
+    <item msgid="616161687718081936">"mainīt kontaktpersonu informāciju"</item>
+    <item msgid="7638002295329050091">"nolasīt zvanu žurnālu"</item>
+    <item msgid="6546959730920410907">"modificēt zvanu žurnālu"</item>
+    <item msgid="446877710771379667">"lasīt kalendāru"</item>
+    <item msgid="7674458294386319722">"modificēt kalendāru"</item>
+    <item msgid="8281201165558093009">"Wi-Fi meklēšana"</item>
+    <item msgid="8694611243479480497">"paziņojums"</item>
+    <item msgid="7776439107987345446">"mobilā tālruņa meklēšana"</item>
+    <item msgid="514615766544675057">"zvanīt uz tālruņa numuru"</item>
+    <item msgid="8181415497109310680">"lasīt īsziņu"</item>
+    <item msgid="6816551144382117307">"rakstīt īsziņu"</item>
+    <item msgid="4600463921908905030">"saņemt īsziņu"</item>
+    <item msgid="5958926493289432745">"saņemt ārkārtas īsziņu"</item>
+    <item msgid="4945269495221089540">"saņemt multiziņu"</item>
+    <item msgid="5570472453573929087">"saņemt WAP push ziņojumu"</item>
+    <item msgid="7125408150230860501">"sūtīt īsziņu"</item>
+    <item msgid="7080337936612188061">"lasīt ICC īsziņu"</item>
+    <item msgid="587124103118495063">"rakstīt ICC īsziņu"</item>
+    <item msgid="2320577158869025503">"modificēt iestatījumus"</item>
+    <item msgid="1545733463471924009">"zīmēt augšdaļā"</item>
+    <item msgid="3609046903962454582">"piekļūt paziņojumiem"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"ierakstīt audio"</item>
+    <item msgid="5031552983987798163">"atskaņot audio"</item>
+    <item msgid="8374996688066472414">"lasīt starpliktuvi"</item>
+    <item msgid="3045529469061083747">"modificēt starpliktuvi"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Atrašanās vieta"</item>
+    <item msgid="8677040780775113033">"Atrašanās vieta"</item>
+    <item msgid="1660743989948992916">"Atrašanās vieta"</item>
+    <item msgid="8791172739860195290">"Vibrozvans"</item>
+    <item msgid="383413555642128046">"Lasīt kontaktpersonas"</item>
+    <item msgid="3654594895269697313">"Mainīt kontaktpersonu informāciju"</item>
+    <item msgid="7928393476362362538">"Nolasīt zvanu žurnālu"</item>
+    <item msgid="6248591205254641116">"Modificēt zvanu žurnālu"</item>
+    <item msgid="6093344633066170692">"Lasīt kalendāru"</item>
+    <item msgid="1334886368750347692">"Modificēt kalendāru"</item>
+    <item msgid="1638204101698708656">"Atrašanās vieta"</item>
+    <item msgid="2154671955760380322">"Publicēt paziņojumu"</item>
+    <item msgid="4282477730595931828">"Atrašanās vieta"</item>
+    <item msgid="4891423912898525905">"Zvanīt uz tālruņa numuru"</item>
+    <item msgid="626463821668200388">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="1237538540368797101">"Sūtīt īsziņu vai multiziņu"</item>
+    <item msgid="3986142739951490025">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="3984213795861739778">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="3656243523752472788">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="8105802370238551510">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="1407766984645388488">"Sūtīt īsziņu vai multiziņu"</item>
+    <item msgid="1530132603376027248">"Saņemt īsziņu vai multiziņu"</item>
+    <item msgid="1188256962149204607">"Sūtīt īsziņu vai multiziņu"</item>
+    <item msgid="4218544235221631789">"Modificēt iestatījumus"</item>
+    <item msgid="736541391767350377">"Zīmēt augšdaļā"</item>
+    <item msgid="5530815681721654194">"Piekļūt paziņojumiem"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Ierakstīt audio"</item>
+    <item msgid="3493046322001257041">"Atskaņot audio"</item>
+    <item msgid="136815868796597058">"Lasīt starpliktuvi"</item>
+    <item msgid="5238692940326972503">"Modificēt starpliktuvi"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Īss"</item>
     <item msgid="2560532955514699713">"Vidējs"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"glGetError: zvanu kaskāde"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Izslēgts"</item>
+    <item msgid="675719912558941285">"Lieko daļu iekrāsot zilā krāsā"</item>
+    <item msgid="1064373276095698656">"Pārb. zīmēš. kom. iezīmēt zaļu"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Izslēgta"</item>
+    <item msgid="2751513398307949636">"Ekrānā kā joslas"</item>
+    <item msgid="8272260411216018353">"Ekrānā kā līnijas"</item>
+    <item msgid="120512413928262547">"Komandā “adb shell dumpsys gfxinfo”"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standarta ierobežojums"</item>
     <item msgid="4071574792028999443">"Nav fona procesu"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 9b2eaef..4b41072 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Lidojuma režīms"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Vēl..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezvadu pakalpojums un tīkli"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo sakaru tīklu un VPN pārvaldība"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo tīklu un VPN pārvaldība"</string>
     <string name="roaming" msgid="3596055926335478572">"Datu viesabonēšana"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Viesabonēšanas laikā izveidot savienojumu ar datu pakalpojumiem"</string>
@@ -304,11 +304,13 @@
     <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="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Rādīt informāciju par īpašnieku bloķētā ekrānā"</string>
-    <string name="owner_info_settings_title" msgid="2723190010708381889">"Inf. par īpašnieku"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Informācija par īpašnieku"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ierakstiet bloķēšanas ekrānā parādāmo tekstu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bloķēšanas ekrānā rādīt informāciju par lietotāju"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Lietot. informācija"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Rādīt profila informāciju bloķētā ekrānā"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profila informācija"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Piekļuve atrašanās vietai"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Drošība"</string>
     <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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Ierīces administrācija"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Ierīces administratori"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Skatiet vai deaktivizējiet ierīces administratorus"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ieslēgt Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Iegaumēt iestatījumus"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Bezvadu attēlošana"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Lai skatītu ierīces, ieslēdziet bezvadu attēlošanu."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Bezvadu attēlošana ir atspējota, jo Wi-Fi savienojums ir izslēgts."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bezvadu displejs ir atspējots, jo Wi-Fi savienojums ir izslēgts."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Meklēt displejus"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Notiek meklēšana..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Tuvumā netika atrasti bezvadu displeji."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Ja šī funkcija ir ieslēgta, varat pārvietot lietotnes saturu uz citu ierīci, kas atbalsta NFC, novietojot ierīces blakus vienu otrai. Piemēram, varat pārvietot pārlūkprogrammas lapas, YouTube videoklipus, kontaktpersonas lietotnē Personas un citu saturu."\n\n"Vienkārši novietojiet ierīces blakus (parasti saskaroties to aizmugures daļai) un pieskarieties savam ekrānam. Lietotne noteiks pārvietojamo informāciju."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Tīkla pakalpojuma atrašana"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Atļaut citās ierīcēs esošām lietotnēm atrast šajā ierīcē esošās lietotnes"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ieslēgt Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi iestatījumi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ieslēgt Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi iestatījumi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Bezvadu piekļuves punktu iestatīšana un pārvaldība"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Izvēlēties Wi-Fi tīklu"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Tiek ieslēgts Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Notiek Wi-Fi izslēgšana..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Atlasīt Wi-Fi tīklu"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Notiek Wi-Fi ieslēgšana..."</string>
+    <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="3038290727701553612">"Informēt mani, kad ir pieejams atvērts tīkls"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Nelietot vājus savienojumus"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nelietot Wi-Fi tīklu, ja vien tam nav labs interneta savienojums"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Aktivizēt Wi-Fi arī miega režīmā"</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_scan_always_available" msgid="3470564139944368030">"Meklēšana vienmēr pieejama"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Sertifikātu instalēšana"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Atrašanās vietas noteikšanas precizitātes uzlabošanai un citiem nolūkiem Google un citas lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Lietotnes var meklēt tuvumā esošos tīklus pat tad, kad Wi-Fi ir izslēgts. Ja to nevēlaties, atveriet Papildu &gt; Meklēšana vienmēr pieejama."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Vairs nerādīt"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Aktivizēt Wi-Fi arī miega režīmā"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Mainot iestatījumu, radās kļūda"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi optimizācija"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Samazināt akumulatora lietojumu, kad Wi-Fi savienojums ir ieslēgts"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi optimizācija"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Pēc iespējas samazināt akumulatora lietojumu, kad Wi-Fi savienojums ir ieslēgts"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pievienot tīklu"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi tīkli"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi tīkli"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS spiedpoga"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Citas opcijas"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN ievade"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Izveidot savienojumu ar tīklu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Neiegaumēt tīklu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Pārveidot tīklu"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Lai skatītu pieejamos tīklus, ieslēdziet Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Notiek Wi-Fi tīklu meklēšana…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lai skatītu pieejamos tīklus, ieslēdziet Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Notiek Wi-Fi tīklu meklēšana…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jums nav atļaujas mainīt Wi‑Fi tīklu."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Cits tīkls..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Vairāk"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. iestatīšana (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Lai pabeigtu iestatīšanu, planšetdatoram ir nepieciešams Wi-Fi savienojums. Pēc iestatīšanas varat pārslēgties starp mobilo tīklu un Wi-Fi tīklu."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Lai pabeigtu iestatīšanu, planšetdatoram ir nepieciešams Wi-Fi savienojums. Pēc iestatīšanas varat pārslēgties starp mobilajiem datiem un Wi-Fi tīklu."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Rādīt papildopcijas"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi aizsargātā iestatīšana"</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="7204827509934892103">"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="8067502591043979939">"Ievadiet uz Wi-Fi maršrutētāja norādīto PIN numuru <xliff:g id="NUMBER">%1$s</xliff:g>. Iestatīšana var ilgt līdz pat divām minūtēm."</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_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="5754399645462924103">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>."</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>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Jau notiek Wi-Fi aizsargātā iestatīšana, un tās pabeigšana var ilgt divas minūtes."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neizdevās. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Bezvadu maršrutētāja drošības iestatījums (WEP) netiek atbalstīts."</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificēšana neizdevās. Lūdzu, mēģiniet vēlreiz."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Tika noteikta cita WPS sesija. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Tīkla SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Ievadiet SSID."</string>
     <string name="wifi_security" msgid="6603611185592956936">"Drošība"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signāla stiprums"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Statuss"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Vai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Noraidīt"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Izveidot savienojumu"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Neiegaumēt"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Neizlaist"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"BRĪDINĀJUMS! Mobilo sakaru operators var piemērot papildu maksu par datu pārraidi."\n\n"Iestatot planšetdatoru, var ievērojami palielināties tīkla darbības apjoms."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"BRĪDINĀJUMS! Mobilo sakaru operators var piemērot papildu maksu par datu pārraidi."\n\n"Iestatot tālruni, var ievērojami palielināties tīkla darbības apjoms."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"BRĪDINĀJUMS! Planšetdatorā nevarēs pārbaudīt, vai jūsu programmatūra ir atjaunināta."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"BRĪDINĀJUMS! Tālrunī nevarēs pārbaudīt, vai jūsu programmatūra ir atjaunināta."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Planšetdatorā nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Tālrunī nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi papildu iestatījumi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi frekvences josla"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"BRĪDINĀJUMS!Kamēr nebūs izveidots savienojums ar internetu, planšetdators nevarēs apstiprināt, ka jūsu programmatūra ir atjaunināta."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"BRĪDINĀJUMS! Kamēr nebūs izveidots savienojums ar internetu, tālrunis nevarēs apstiprināt, ka jūsu programmatūra ir atjaunināta."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Planšetdatorā nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Tālrunī nevarēja izveidot savienojumu ar Wi-Fi tīklu."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi papildu iestatījumi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi frekvences josla"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Norādiet darbības frekvences diapazonu"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Iestatot frekvences joslu, radās problēma."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adrese"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Vārteja"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tīkla prefiksa garums"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informācija par ierīci"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Atcerēties šo savienojumu"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Meklēt ierīces"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vai atcelt uzaicinājumu?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vai vēlaties atcelt uzaicinājumu izveidot savienojumu ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vai aizmirst šo grupu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Pārnēsājams Wi-Fi tīklājs"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Notiek tīklāja ieslēgšana…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Notiek tīklāja izslēgšana…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Pārnēsājamais tīklājs <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ir aktīvs"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pārnēsājamā Wi-Fi tīklāja kļūda"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Iestatīt Wi-Fi tīklāju"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Pārnēsājamā Wi-Fi tīklāja kļūda"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Iestatīt Wi-Fi tīklāju"</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="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signāla stiprums"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Viesabonēšana"</string>
     <string name="status_operator" msgid="2274875196954742087">"Tīkls"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC adrese"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC adrese"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adrese"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sērijas numurs"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nepieejams"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ir iespējots"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN ir atspējots"</string>
     <string name="bearer" msgid="594270280031923558">"Nesējs"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO veids"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO vērtība"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Dzēst APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Jauns APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Saglabāt"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Palīdzība"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilo sakaru tīkli"</string>
     <string name="location_title" msgid="1029961368397484576">"Mana atrašanās vieta"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi un mobilā tīkla atrašanās vieta"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi un mob. 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="7457348712272184793">"Wi-Fi noteikta atrašanās vieta"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi-Fi noteikta atrašanās vieta"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS satelīti"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Ļaut lietotnēm izmantot jūsu planšetdatorā esošo GPS, lai noteiktu jūsu atrašanās vietu."</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Ļaut lietotnēm izmantot jūsu tālrunī esošo GPS, lai noteiktu jūsu atrašanās vietu."</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtrs"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izvēlēties filtra opcijas"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Visas"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Atspējota"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Lejupielādēts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Darbojas"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB krātuve"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ja atspējosiet iebūvēto lietotni, citas lietotnes, iespējams, nedarbosies pareizi. Jūsu dati arī tiks dzēsti."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vai izslēgt paziņojumus?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Izslēdzot paziņojumus šajā lietotnē, varat palaist garām svarīgus brīdinājumus un atjauninājumus."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Lietotnes darbības"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Darbojas"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nekad nav izmantots)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Krātuves lietojums"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Skatīt lietotnēm izmantoto atmiņu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktīvie pakalpojumi"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Vārds:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Saīsne:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Valoda:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Ierakstiet vārdu."</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Izvēles saīsne"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Vārda rediģēšana"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Rediģēt"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Dzēst"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fiziskās tastatūras iestatījumi"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Izstrādātājiem paredzētas opcijas"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Iestatīt lietotņu izstrādes opcijas"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Šim lietotājam nav pieejamas izstrādātāja opcijas."</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB atkļūdošana"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Atkļūdošanas režīms, kad ir pievienota kopne USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Atsaukt piekļuvi USB atkļūdošanai"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Barošanas izvēlnes kļūdu ziņojumi"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Iekļaut barošanas izvēlnē kļūdu ziņojuma sagatavošanas opciju"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Atstāt nomodā"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vai atļaut izstrādes iestatījumus?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Šie iestatījumi ir paredzēti tikai izstrādei. To dēļ var tikt pārtraukta vai traucēta ierīces un lietojumprogrammu darbība."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificēt, ja instalētas no USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ekrāna palielinājums"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Ekrāna palielinājuma autom. atjaun."</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atjaunināt ekrāna palielinājumu lietotņu pārejās"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Zvana beigšana, nosp. baroš. pogu"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Barošanas poga beidz zvanu"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Paroļu izrunāšana"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Aizkave, pieskaroties un turot"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tīmekļa pieejamības uzlabošana"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Iestatījumi"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ieslēgta"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izslēgta"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Atļauts"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nav atļauta"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Atļaut"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Neļaut"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Vai izmantot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Pakalpojumā <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> var tikt apkopots viss jūsu rakstītais teksts, izņemot paroles. Tas attiecas arī uz personas datiem, piemēram, kredītkaršu numuriem. Pakalpojumā var tikt apkopoti arī dati par jūsu darbībām ar planšetdatoru."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Pakalpojumā <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> var tikt apkopots viss jūsu rakstītais teksts, izņemot paroles. Tas attiecas arī uz personas datiem, piemēram, kredītkaršu numuriem. Pakalpojumā var tikt apkopoti arī dati par jūsu darbībām ar tālruni."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Vai apturēt pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbību?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Pieskaroties pogai Labi, tiks apturēta pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbība."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Novērot jūsu darbības."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Saņemt paziņojumus, kad mijiedarbojaties ar lietotni."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Vai apturēt <xliff:g id="SERVICE">%1$s</xliff:g> darbību?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Pieskaroties pogai Labi, tiks apturēta pakalpojuma <xliff:g id="SERVICE">%1$s</xliff:g> darbība."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nav instalēts neviens pakalpojums."</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Vai jums ir nepieciešams ekrāna lasītājs?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Lietotne TalkBack par ekrānā notiekošo informē balss komentāru veidā, lai palīdzētu neredzīgiem un vājredzīgiem lietotājiem. Vai vēlaties to instalēt bez maksas no vietnes Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vai vēlaties, lai lietotnes instalētu skriptus no Google, kas padara to tīmekļa saturu pieejamāku?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Apraksts nav sniegts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Iestatījumi"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Akumulators"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Uzlāde"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekrāns ir ieslēgts"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ir ieslēgta"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Nomodā"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilā tīkla signāls"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Ierīces nomoda laiks"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi uz laiku"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi uz laiku"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi uz laiku"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi uz laiku"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Vēstures dati"</string>
     <string name="details_title" msgid="3792801565213935385">"Lietojuma dati"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Noregulēt strāvas patēriņu"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Iekļautās pakotnes"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekrāns"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilā tālruņa gaidstāve"</string>
     <string name="power_phone" msgid="5392641106474567277">"Balss zvani"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU akt. režīms"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Neļaut pāriet miega rež."</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi darbojas"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi darbojas"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Planšetdators"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Tālrunis"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dati nosūtīti"</string>
@@ -1382,17 +1410,17 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informācija par lietotni"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Lietotnes iestatījumi"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ekrāna iestatījumi"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi iestatījumi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi iestatījumi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth iestatījumi"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Balss zvaniem patērētā akumulatora jauda"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Izmantotais akumulatora jaudas daudzums, kad planšetdators ir gaidstāvē"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Akumulatora lietojums, kad tālrunis ir dīkstāvē"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Akumulatora patēriņš dīkstāvē"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Mobilās ierīces radio patērētā akumulatora jauda"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Pārslēdziet uz lidojuma režīmu, lai ekonomētu enerģiju apgabalos, kur nav mobilo sakaru pārklājuma."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Displeja un pretgaismas patērētā akumulatora jauda"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Samazināt ekrāna spilgtumu un/vai ekrāna taimautu"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi izmantošanas laikā patērētā akumulatora jauda"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Izslēdziet Wi-Fi, kad to neizmantojat vai kad tas nav pieejams."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi izmantošanas laikā patērētā akumulatora jauda"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Izslēdziet Wi-Fi, kad to neizmantojat vai kad tas nav pieejams."</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth savienojumam patērētā akumulatora enerģija"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Izslēdziet Bluetooth savienojumu, kad to nelietojat"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Mēģiniet izveidot savienojumu ar citu Bluetooth ierīci"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurēt"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izvēlēties citu programmu"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lietojot šo runas sintēzes programmu, var tikt apkopots viss ierunātais teksts, tostarp tāda personīgā informācija kā paroles un kredītkaršu numuri. Tā ir no <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> programmas. Vai iespējot šīs runas sintēzes programmas lietošanu?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Lai izmantotu teksta pārveidošanu runā šajā valodā, ir nepieciešams aktīvs tīkla savienojums."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Programmas"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> iestatījumi"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ir iespējots"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Vēlamā programma"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Vispārīgi"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Barošanas vadība"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi iestatījumu atjaunināšana"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi iestatījumu atjaunināšana"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth iestatījumu atjaunināšana"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ieslēgts"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"izslēgts"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"notiek ieslēgšana"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"notiek izslēgšana"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinhronizācija"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Noņemt visus sertifikātus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Uzticami akreditācijas dati"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Attēlot uzticamus CA sertifikātus"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Krātuves tips"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Krātuve aparatūrā"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Tikai programmatūrā"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Dublēšana un atjaunošana"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personīgie dati"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Dublēt manus datus"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Dublēt lietotnes datus, Wi-Fi paroles un citus iestatījumus Google serveros"</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="auto_restore_title" msgid="5397528966329126506">"Automātiska atjaunošana"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Jaunā parole un apstiprinājums neatbilst."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Iestatot rezerves paroli, radās kļūme."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vai pārtraukt Wi-Fi paroļu, grāmatzīmju, lietotņu datu un citu iestatījumu dublēšanu un dzēst visas to kopijas Google serveros?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vai pārtraukt Wi-Fi paroļu, grāmatzīmju, lietotņu datu un citu iestatījumu dublēšanu un dzēst visas to kopijas Google serveros?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ierīces administrācijas iestatījumi"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Ierīces administrators"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Dezaktivēt"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Paziņojumi"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Zvana signāls un vibrozvans"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistēma"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi iestatīšana"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Izveidot savienojumu ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Notiek savienojuma izveide ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi iestatīšana"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Savienojuma izveide ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Notiek savienojuma izveide ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pievienot tīklu"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Savienojums nav izveidots"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pievienot tīklu"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Notiek savienojuma izveide..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Pārejiet pie nākamās darbības"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP netiek atbalstīts."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Iestatīšanas laikā nevar konfigurēt EAP Wi-Fi savienojumu. To var izdarīt pēc iestatīšanas, ekrānos Iestatījumi &gt; Bezvadu savienojumi un tīkli."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Iestatīšanas laikā nevar konfigurēt EAP Wi-Fi savienojumu. To var izdarīt pēc iestatīšanas šeit: Iestatījumi &gt; Bezvadu savienojumi un tīkli."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Savienojuma izveide var ilgt dažas minūtes..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>"."\n\n"Lai izveidotu savienojumu ar citu WiFi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>"."\n\n"Lai izveidotu savienojumu ar citu Wi-Fi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizācija iespējota"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizācija atspējota"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinhronizācijas kļūda"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Gaida atkļūdotāju, ko pirms izp. piev. atkļ. liet."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Ievade"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Zīmējums"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Aparatūras paātrinātā atveidošana"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Pārraudzība"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Precīzais rež. ir iespēj."</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Zibsnīt ekrānu, ja liet. ilgi darbojas galv. pav."</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kārtība: zils, zaļš, gaiši sarkans, sarkans"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Atspējot HW pārklājumus"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Iespējot trases"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Iespējoto trašu atlase"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Pašlaik nav iespējota neviena trase."</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Pašlaik iespējotas <xliff:g id="NUM">%1$d</xliff:g> trases."</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Pašlaik iespējotas visas trases."</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Iespējot OpenGL trases"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Rādīt izkārtojuma robežas"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Rādīt klipu robežas, malas utt."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Izmantot GPU atveidi divdimensiju zīmējumiem"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA piespiedu palaiš."</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Iespējot 4x MSAA OpenGL ES 2.0 lietotnēs"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Atkļūdot darbības daļā, kas nav taisnstūris."</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profila GPU atveide"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mērīt atveides laiku: adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Loga animācijas mērogs"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Fona procesu ierobežojums"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Rādīt visus ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Rādīt fona lietotņu dialoglodz. Lietotne nereaģē"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Lietot eksperim. WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Lietotnēs tiks lietots jaunākais (beta) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datu lietojums"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Datu izmantošanas cikls"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Datu viesabonēšana"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ierobežot fona datus"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Atsevišķs 4G lietojums"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Rādīt inform. par Wi-Fi izmant."</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Rādīt inf. par Wi-Fi izm."</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Rādīt tīkla Ethernet lietojumu"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobilie tīklāji"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Datu automātiska sinhronizācija"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Iestatīt mobilo datu ierobež."</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Iestatīt 4G datu ierobežojumu"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Iestatīt 2G–3G datu ierobežojumu"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Iestatīt Wi-Fi datu ierobežojumu"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Iest. Wi-Fi datu ierobež."</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mob. dati"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts planšetdatorā un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobilais datu savienojums tiks atspējots, tiklīdz būs sasniegts noteiktais ierobežojums."\n\n"Tā kā datu lietojuma apjoms tiek aprēķināts tālrunī un mobilo sakaru operatoru aprēķini par datu lietojumu var atšķirties, ierobežojumu izvēlieties apdomīgi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vai ierobežot fona datus?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ja tiks ierobežoti fona mobilie dati, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ja ierobežosiet fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja nebūsiet izveidojis savienojumu ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ja ierobežosiet fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja nebūsiet izveidojis savienojumu ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ierobežojot fona mobilos datus, dažas lietotnes un pakalpojumi nedarbosies, ja vien netiks izveidots savienojums ar Wi-Fi tīklu."\n\n"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"brīdinājums"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ierobežojums"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Noņemtās lietotnes"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: izm. apm. <xliff:g id="TOTAL">%1$s</xliff:g> (noteikts planšetdatorā). Mob. sak. oper. aprēķini var atšķirties."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: izmantots apm. <xliff:g id="TOTAL">%1$s</xliff:g> (noteikts tālrunī). Mob. sak. operat. aprēķini var atšķirties."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilie tīklāji"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Atlasiet Wi-Fi tīklus, kas ir mobilie tīklāji. Lietotnēm var  aizliegt izmantot šos tīklus, ja tās darbojas fonā. Lietotnes var brīdināt pirms šo tīklu izmantošanas, lai veiktu lielas lejupielādes."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Atlasiet Wi-Fi tīklus, kas ir mobilie tīklāji. Lietotnēm var aizliegt izmantot šos tīklus, ja tās darbojas fonā. Lietotnes var brīdināt pirms šo tīklu izmantošanas apjomīgu lejupielāžu veikšanai."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilie tīkli"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi tīkli"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Lai atlasītu mobilos tīklājus, ieslēdziet Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi tīkli"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Lai atlasītu mobilos tīklājus, ieslēdziet Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ārkārtas zvans"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Atgriezties pie zvana"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nosaukums"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Atļaujošs"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Īstenots"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Lietotāji"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Informācija par jums"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Citi lietotāji"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Pievienot lietotāju"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktīvs"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktīvs"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Lietotāji un profili"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Pievienot lietotāju vai profilu"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ierobežots profils"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Lai varētu izveidot ierobežotu profilu, jums jāiestata ekrāna bloķēšana, kas aizsargās jūsu lietotni un personas datus."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Iestatīt bloķēšanu"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nav iestatīts"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ierobežots profils — nav iestatīts."</string>
     <string name="user_owner" msgid="3879126011135546571">"Īpašnieks"</string>
+    <string name="user_you" msgid="1639158809315025986">"Jūs (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Segvārds"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Pievienošana"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Lietotājiem ir savas lietotnes un saturs."</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Varat ierobežot piekļuvi lietotnēm un saturam no sava konta."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Lietotājs"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ierobežots profils"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lietotāja pievienošana"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Varat koplietot šo ierīci ar citām personām, pievienojot papildu lietotājus. Katram lietotājam ir sava vide, kas ir pielāgojama, izmantojot savas lietotnes, fona tapetes u. c. Lietotāji var arī pielāgot planšetdatora iestatījumus, kuri attiecas uz visiem lietotājiem, piemēram, Wi-Fi."\n\n"Kad ir pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Varat koplietot šo ierīci ar citām personām, pievienojot papildu lietotājus. Katram lietotājam ir sava vide, ko var pielāgot, izmantojot lietotnes, fona tapetes u.c. Lietotāji var arī pielāgot tādus planšetdatora iestatījumus, kuri attiecas uz visiem lietotājiem, piemēram, Wi-Fi."\n\n"Kad tiek pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Kad ir pievienots jauns lietotājs, viņam ir jāveic iestatīšanas process."\n\n"Ikviens lietotājs var atļaut lietotņu atjaunināšanu citu lietotāju vietā."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Iestatīt kontu tūlīt?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Lietotājam ir jābūt iespējai iestatīt savu telpu, izmantojot planšetdatoru"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vai iestatīt profilu tūlīt?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Iestatīt tūlīt"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Vēlāk"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Lietotājus var pārvaldīt tikai planšetdatora īpašnieks."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Lietotājus var pārvaldīt tikai tālruņa īpašnieks."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ierobežoti profili nevar pievienot kontus."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Dzēst šajā ierīcē: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Jauns lietotājs"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Jauns profils"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vai dzēst jūsu kontu?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vai noņemt lietotāju?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vai noņemt profilu?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Jūs zaudēsiet savu vidi un datus šajā planšetdatorā. Šo darbību nevar atsaukt."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Jūs zaudēsiet savu vidi un datus šajā tālrunī. Šo darbību nevar atsaukt."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Šī lietotāja vide un dati tiks noņemti no šī planšetdatora. Šo darbību nevar atsaukt."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Šī lietotāja vide un dati tiks noņemti no šī tālruņa. Šo darbību nevar atsaukt."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Šī profila vide un dati tiks noņemti no šī planšetdatora. Šo darbību nevar atsaukt."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Šī profila vide un dati tiks noņemti no šī tālruņa. Šo darbību nevar atsaukt."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Jauna lietotāja pievienošana…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Dzēst lietotāju"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Dzēst"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Šis iestatījums ietekmē visus šī planšetdatora lietotājus."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Šis iestatījums ietekmē visus šī tālruņa lietotājus."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Valodas maiņa"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Dokuments ar foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Šūnu apraides"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Atlasiet rādāmos ārkārtas situāciju brīdinājumus."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Lietotņu un satura ierobežojumi"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PĀRDĒVĒT"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Iestatīt lietotņu 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Atļaut Bluetooth savienošanas pārī un iestatījumu pārveidošanu"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"TDLS"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Atļaut datu apmaiņu, kad planšetdators saskaras ar citu ierīci"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Atļaut datu apmaiņu, kad tālrunis saskaras ar citu ierīci"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Piekļuve atrašanās vietai"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Atļaut lietotnēs izmantot informāciju par atrašanās vietu"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Atpakaļ"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Tālāk"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Pabeigt"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Uzņemt fotoattēlu"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Izvēlēties fotoattēlu no galerijas"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index d1ab68d..82d4837 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Perlahan"</item>
     <item msgid="1145554631248513562">"Biasa"</item>
     <item msgid="7553665153391107454">"Laju"</item>
-    <item msgid="2538100882620724753">"Sangat cepat"</item>
+    <item msgid="1370673569131070146">"Lebih cepat"</item>
+    <item msgid="4648206845228970803">"Sangat cepat"</item>
+    <item msgid="4977949754169483251">"Cepat"</item>
+    <item msgid="6106302964845503577">"Sangat cepat"</item>
+    <item msgid="6800277205640837264">"Terpantas"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Sangat rendah"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Tiada"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tiada"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Tidak ditentukan"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Tiada"</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">"Storan dalaman peranti"</item>
     <item msgid="3738430123799803530">"Kad SD boleh tanggal"</item>
     <item msgid="4498124044785815005">"Biar sistem menentukan"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Lokasi"</item>
+    <item msgid="255608127647030286">"Peribadi"</item>
+    <item msgid="4588829735729884491">"Pemesejan"</item>
+    <item msgid="8971765125227378270">"Peranti"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"lokasi kasar"</item>
+    <item msgid="5789673140227507995">"lokasi terperinci"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"bergetar"</item>
+    <item msgid="3434165993711230924">"baca kenalan"</item>
+    <item msgid="616161687718081936">"ubah suai kenalan"</item>
+    <item msgid="7638002295329050091">"baca log panggilan"</item>
+    <item msgid="6546959730920410907">"ubah suai log panggilan"</item>
+    <item msgid="446877710771379667">"baca kalendar"</item>
+    <item msgid="7674458294386319722">"ubah suai kalendar"</item>
+    <item msgid="8281201165558093009">"imbasan wi-fi"</item>
+    <item msgid="8694611243479480497">"pemberitahuan"</item>
+    <item msgid="7776439107987345446">"imbasan sel"</item>
+    <item msgid="514615766544675057">"Hubungi telefon"</item>
+    <item msgid="8181415497109310680">"baca SMS"</item>
+    <item msgid="6816551144382117307">"tulis SMS"</item>
+    <item msgid="4600463921908905030">"terima SMS"</item>
+    <item msgid="5958926493289432745">"terima SMS kecemasan"</item>
+    <item msgid="4945269495221089540">"terima MMS"</item>
+    <item msgid="5570472453573929087">"terima penolakan WAP"</item>
+    <item msgid="7125408150230860501">"hantar SMS"</item>
+    <item msgid="7080337936612188061">"baca SMS ICC"</item>
+    <item msgid="587124103118495063">"tulis SMS ICC"</item>
+    <item msgid="2320577158869025503">"ubah suai tetapan"</item>
+    <item msgid="1545733463471924009">"lukiskan di atas"</item>
+    <item msgid="3609046903962454582">"pemberitahuan akses"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"rakam audio"</item>
+    <item msgid="5031552983987798163">"mainkan audio"</item>
+    <item msgid="8374996688066472414">"baca papan keratan"</item>
+    <item msgid="3045529469061083747">"ubah suai papan keratan"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasi"</item>
+    <item msgid="8677040780775113033">"Lokasi"</item>
+    <item msgid="1660743989948992916">"Lokasi"</item>
+    <item msgid="8791172739860195290">"Bergetar"</item>
+    <item msgid="383413555642128046">"Baca kenalan"</item>
+    <item msgid="3654594895269697313">"Ubah suai kenalan"</item>
+    <item msgid="7928393476362362538">"Baca log panggilan"</item>
+    <item msgid="6248591205254641116">"Ubah suai log panggilan"</item>
+    <item msgid="6093344633066170692">"Baca kalendar"</item>
+    <item msgid="1334886368750347692">"Ubah suai kalendar"</item>
+    <item msgid="1638204101698708656">"Lokasi"</item>
+    <item msgid="2154671955760380322">"Siarkan pemberitahuan"</item>
+    <item msgid="4282477730595931828">"Lokasi"</item>
+    <item msgid="4891423912898525905">"Hubungi telefon"</item>
+    <item msgid="626463821668200388">"Terima SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Hantar SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Terima SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Terima SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Terima SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Terima SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Hantar SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Terima SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Hantar SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Ubah suai tetapan"</item>
+    <item msgid="736541391767350377">"Lukiskan di atas"</item>
+    <item msgid="5530815681721654194">"Pemberitahuan akses"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rakam audio"</item>
+    <item msgid="3493046322001257041">"Mainkan audio"</item>
+    <item msgid="136815868796597058">"Baca papan keratan"</item>
+    <item msgid="5238692940326972503">"Ubah suai papan keratan"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Pendek"</item>
     <item msgid="2560532955514699713">"Sederhana"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Grafik)"</item>
     <item msgid="1340692776955662664">"Tindanan panggilan pada glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Mati"</item>
+    <item msgid="675719912558941285">"Lukis kawasan keratan bukan segi empat tepat berwarna biru"</item>
+    <item msgid="1064373276095698656">"Serlahkan perintah lukisan berwarna hijau yang diuji"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Matikan"</item>
+    <item msgid="2751513398307949636">"Pada skrin sebagai bar"</item>
+    <item msgid="8272260411216018353">"Pada skrin sebagai garis"</item>
+    <item msgid="120512413928262547">"Dalam adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Had standard"</item>
     <item msgid="4071574792028999443">"Tiada proses latar belakang"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 137858b..1d95bac 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Mod pesawat"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Lagi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wayarles &amp; rangkaian"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Urus Wi-Fi, Bluetooth, mod pesawat, rangkaian mudah alih &amp; VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Urus Wi‑Fi, Bluetooth, mod pesawat, rangkaian mudah alih &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Perayauan data"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Sambung ke perkhidmatan data semasa perayauan"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Sambung ke perkhidmatan data semasa malakukan perayauan"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Taip teks untuk dipaparkan pada skrin kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tunjukkan maklumat pengguna pada skrin kunci"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Maklumat pengguna"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tunjukkan maklumat profil pada skrin kunci"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Maklumat profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Akses lokasi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Keselamatan"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Pentadbiran peranti"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Pentadbir peranti"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nyahaktifkan pentadbir peranti"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Hidupkan Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ingat tetapan"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Paparan wayarles"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Untuk melihat peranti, hidupkan paparan wayarles."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Paparan wayarles dilumpuhkan kerana Wi-Fi dimatikan."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Paparan wayarles dilumpuhkan kerana Wi-Fi dimatikan."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Carian untuk paparan"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Mencari..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Tiada paparan wayarles berhampiran ditemui."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Apabila ciri ini dihidupkan, anda boleh memancarkan kandungan aplikasi ke peranti mampu NFC yang lain dengan merapatkan kedua-dua peranti itu. Sebagai contoh, anda boleh memancarkan halaman Penyemak Imbas, video YouTube, maklumat Hubungan orang dan banyak lagi."\n\n"Hanya rapatkan kedua-dua peranti (biasanya bersentuhan belakang dengan belakang) dan kemudian sentuh skrin anda. Aplikasi menentukan apa yang akan dipancarkan."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Penemuan perkhidmatan rangkaian"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Benarkan apl pada peranti lain untuk menemui apl pada peranti ini"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Hidupkan Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Tetapan Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Hidupkan Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Tetapan Wi‑Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sediakan &amp; urus titik capaian wayarles"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Pilih Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Menghidupkan Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Mematikan Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pilih Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Menghidupkan Wi‑Fi…"</string>
+    <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="3038290727701553612">"Beritahu saya apabila rangkaian terbuka tersedia"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Elakkan sambungan lemah"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Jangan gunakan rangkaian Wi-Fi melainkan jika ia mempunyai sambungan internet yang baik"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Biarkan Wi-Fi aktif semasa tidur"</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_scan_always_available" msgid="3470564139944368030">"Imbasan sentiasa tersedia"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Benarkan perkhidmatan lokasi Google dan apl lain mengimbas rangkaian, walaupun semasa Wi-Fi dimatikan"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Pasang sijil"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, Google dan apl lain mungkin mengimbas rangkaian berhampiran walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apl mungkin mengimbas rangkaian berhampiran, walaupun semasa Wi-Fi dimatikan. Jika anda tidak mahu ini berlaku, pergi ke Terperinci &gt; Pengimbasan sentiasa tersedia."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Jangan tunjukkan lagi"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Biarkan Wi-Fi aktif semasa tidur"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Terdapat masalah menukar tetapan"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Pengoptimuman Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimumkan penggunaan bateri apabila Wi-Fi dihidupkan"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pengoptimuman Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimumkan penggunaan bateri apabila Wi-Fi dihidupkan"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Tambah rangkaian"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Rangkaian Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Rangkaian Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Butang Tekan WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Lagi pilihan"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Masukan Pin WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Langsung"</string>
+    <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_connect" msgid="4996220309848349408">"Sambung kepada rangkaian"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan rangkaian"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Untuk melihat rangkaian tersedia, hidupkan Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Mencari rangkaian Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Untuk melihat rangkaian yang tersedia, hidupkan Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Mencari rangkaian Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tiada kebenaran untuk menukar rangkaian Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Rangkaian lain..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Lagi"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Persediaan automatik (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Untuk melengkapkan persediaan, tablet anda memerlukan akses ke Wi-Fi. Sesudah persediaan, anda boleh beralih antara data mudah alih dan Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Untuk melengkapkan persediaan, tablet anda memerlukan akses ke Wi-Fi. Selepas persediaan, anda boleh beralih antara data mudah alih dan Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Tunjukkan pilihan terperinci"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Persediaan Terlindung Wi-Fi"</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="7204827509934892103">"Tekan butang Persediaan Terlindung Wi-Fi di router anda. Namanya mungkin \"WPS\" atau mengandungi simbol ini:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Disambungkan ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Disambungkan ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS sudah pun dijalankan dan boleh mengambil masa sehingga dua minit untuk selesai"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS gagal. Sila cuba lagi dalam beberapa minit."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Tetapan keselamatan penghala wayarles (WEP) tidak disokong"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pengesahan gagal. Sila cuba lagi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Sesi WPS lain dikesan. Sila cuba lagi dalam beberapa minit."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID rangkaian"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Masukkan SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Keselamatan"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Kekuatan isyarat"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Benarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tolak"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Sambung"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Lupakan"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Jangan langkau"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan."\n\n"Persediaan tablet berpotensi menggunakan aktiviti rangkaian yang besar."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AMARAN: Anda mungkin dikenakan caj data pembawa tambahan."\n\n"Persediaan telefon berpotensi menggunakan aktiviti rangkaian yang banyak."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AMARAN: Tablet tidak akan dapat mengesahkan bahawa perisian anda terkini."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AMARAN: Telefon tidak akan dapat mengesahkan bahawa perisian anda terkini."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Lanjutan"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Jalur frekuensi Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AMARAN: Tablet tidak dapat mengesahkan bahawa perisian anda terkini sehingga anda mempunyai sambungan internet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AMARAN: Telefon tidak dapat mengesahkan bahawa perisian anda terkini sehingga anda mempunyai sambungan internet."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon tidak dapat menyambung ke rangkaian Wi-Fi ini."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Lanjutan"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Gelombang frekuensi Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tentukan julat frekuensi operasi"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Terdapat masalah menetapkan jalur frekuensi."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Alamat MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Get laluan"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Panjang awalan rangkaian"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Langsung"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Langsung"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Maklumat peranti"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ingat sambungan ini"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Mencari peranti"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan jemputan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Adakah anda mahu membatalkan jemputan untuk berhubung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Lupakan kumpulan ini?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Tempat liputan Wi-Fi mudah alih"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Menghidupkan tempat liputan..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan tempat liputan..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Titik panas mudah alih <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ralat titik panas Wi-Fi mudah alih"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Sediakan tempat liputan Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> titik panas Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Ralat tempat liputan Wi-Fi mudah alih"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Sediakan tempat liputan 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> tempat liputan Wi-Fi mudah alih"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"TitikPanasAndroid"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Kekuatan isyarat"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Perayauan"</string>
     <string name="status_operator" msgid="2274875196954742087">"Rangkaian"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Alamat MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Alamat MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Alamat Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nombor siri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Tidak tersedia"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN didayakan"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN dilumpuhkan"</string>
     <string name="bearer" msgid="594270280031923558">"Pembawa"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Jenis MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Nilai MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Padam APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN Baru"</string>
     <string name="menu_save" msgid="8109345640668285399">"Simpan"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Bantuan"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Rangkaian mudah alih"</string>
     <string name="location_title" msgid="1029961368397484576">"Lokasi Saya"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Lokasi Wi-Fi &amp; mudah alih"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Lokasi Wi-Fi &amp; rangkaian mudah alih"</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="7457348712272184793">"Lokasi ditentukan oleh Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokasi ditentukan oleh Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelit GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Biarkan apl menggunakan GPS pada tablet anda untuk menentukan lokasi anda"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Biarkan apl menggunakan GPS pada telefon anda untuk menentukan lokasi anda"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Tapis"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Buat pilihan penapis"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Semua"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Dilumpuhkan"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Sudah dimuat turun"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Dijalankan"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storan USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Jika anda melumpuhkan apl terbina dalam, apl lain mungkin tidak berfungsi dengan betul. Data anda juga akan dipadamkan."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Matikan pemberitahuan"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jika anda mematikan pemberitahuan untuk apl ini, anda mungkin terlepas amaran dan kemas kini penting."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Pengendalian apl"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Dijalankan"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Penggunaan storan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Lihat storan yang digunakan oleh aplikasi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Perkhidmatan dijalankan"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Perkataan:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Pintasan:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Bahasa:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Taip perkataan"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Pintasan pilihan"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edit perkataan"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Padam"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Tetapan papan kekunci fizikal"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Pilihan pemaju"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Tetapkan pilihan untuk pembangunan aplikasi"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Pilihan Pemaju tidak tersedia untuk pengguna ini"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Penyahpepijatan USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mod nyahpepijat apabila USB disambungkan"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Batalkan kebenaran penyahpepijatan USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Laporan pepijat menu kuasa"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Masukkan pilihan dalam menu kuasa untuk mengambil laporan pepijat"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap berjaga"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Benarkan tetapan pembangunan?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Tetapan ini adalah untuk penggunaan pembangunan sahaja. Peranti dan aplikasi yang terdapat padanya boleh rosak atau tidak berfungsi dengan betul."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Sahkan apl melalui USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Butang kuasa menamatkan panggilan"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Tuturkan kata laluan"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Kelewatan sentuh &amp; tahan"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Tingkatkan kebolehaksesan web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Tetapan"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Hidup"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Mati"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dibenarkan"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Tidak dibenarkan"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Benarkan"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Jangan benarkan"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Gunakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> boleh mengumpul semua teks yang anda taip, kecuali kata laluan. Ini termasuklah data peribadi seperti nombor kad kredit. Ia juga boleh mengumpul data tentang interaksi anda dengan tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> boleh mengumpul semua teks yang anda taip, kecuali kata laluan. Ini termasuklah data peribadi seperti nombor kad kredit. Ia juga boleh mengumpul data tentang interaksi anda dengan telefon."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Perhatikan tindakan anda"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Terima pemberitahuan apabila anda berinteraksi dengan apl."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Hentikan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Menyentuh OK akan menghentikan <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Tiada perkhidmatan dipasang"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Perlukan pembaca skrin?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack menyediakan maklum balas bersuara untuk membantu pengguna yang buta dan berpenglihatan kabur. Adakah anda ingin memasangnya secara percuma dari Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Adakah anda mahu aplikasi memasang skrip daripada Google yang menjadikan kandungan laman web mereka lebih mudah diakses?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Tiada keterangan disediakan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Tetapan"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateri"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Mengecas"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skrin dihidupkan"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS hidup"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Berjaga"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isyarat rgkaian mdah alih"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Waktu jaga peranti"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Masa hidup Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Masa hidup Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Masa hidup Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Masa hidup Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Butiran sejarah"</string>
     <string name="details_title" msgid="3792801565213935385">"Gunakan butiran"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Laraskan penggunaan kuasa"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pakej yang disertakan"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skrin"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Sel tunggu sedia"</string>
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Latar depan CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Kekal berjaga"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi berjalan"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi berjalan"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data yang dihantar"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Maklumat aplikasi"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Tetapan aplikasi"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Tetapan skrin"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Tetapan Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Tetapan Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Tetapan Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateri yang digunakan oleh panggilan suara"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateri yang digunakan apabila tablet melahu"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Tukar kepada mod pesawat untuk menjimatkan kuasa di kawasan yang tiada liputan sel"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateri yang digunakan oleh paparan dan lampu latar"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Kurangkan kecerahan skrin dan/atau tamat masa skrin"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateri yang digunakan oleh Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Matikan Wi-Fi apabila tidak menggunakannya atau apabila ia tidak tersedia"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Bateri yang digunakan oleh Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Matikan Wi-Fi apabila tidak menggunakannya atau apabila tidak tersedia"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bateri digunakan oleh Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Matikan Bluetooth apabila anda tidak menggunakannya"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Cuba menyambung ke peranti Bluetooth yang lain"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurasi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pilih enjin lain"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Enjin sintesis pertuturan ini mungkin boleh mengumpul semua teks yang akan dituturkan, termasuk data peribadi seperti kata laluan dan nombor kad kredit. Ia datang daripada enjin <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Dayakan penggunaan enjin sintesis pertuturan ini?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bahasa ini memerlukan sambungan rangkaian yang berfungsi untuk output teks-ke-tutur."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Enjin"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Tetapan <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> didayakan"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Enjin pilihan"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Umum"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kawalan kuasa"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Mengemas kini tetapan Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Mengemas kini tetapan Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Mengemas kini tetapan Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"hidup"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"mati"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"menghidupkan"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"mematikan"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Segerakkan"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua sijil"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Jenis storan"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Bersandarkan perkakasan"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Perisian sahaja"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Lukis corak buka kunci anda"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sandarkan &amp; pulihkan"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data peribadi"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sandarkan data saya"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Sandarkan data aplikasi, kata laluan Wi-Fi dan tetapan lain ke pelayan Google"</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="auto_restore_title" msgid="5397528966329126506">"Pemulihan automatik"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Kata laluan baharu dan pengesahan tidak sepadan"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Kegagalan menetapkan kata laluan sandaran"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Berhenti membuat sandaran kata laluan Wi-Fi anda, penanda halaman, tetapan lain, dan data aplikasi, serta padamkan semua salinan di pelayan Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Berhenti membuat sandaran kata laluan Wi-Fi anda, penanda halaman, tetapan lain dan data apl serta padamkan semua salinan pada pelayan Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Tetapan pentadbir peranti"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Pentadbir peranti"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Nyahaktifkan"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Pemberitahuan"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Nada dering &amp; getaran panggilan"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Persediaan Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Sambung kepada rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Menyambung ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Disambungkan kepada rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Persediaan Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Sambung ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Menyambung ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Disambungkan kepada rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Tambah rangkaian"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Tidak bersambung"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tambah rangkaian"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Menyambung..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Pergi ke langkah seterusnya"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP tidak disokong."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Anda tidak boleh mengkonfigurasi sambungan Wi-Fi EAP semasa pemasangan. Selepas pemasangan, anda boleh melakukannya dalam Tetapan &gt;  Wayarles &amp; Rangkaian."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Anda tidak boleh mengkonfigurasi sambungan Wi-Fi EAP semasa persediaan. Selepas persediaan, anda boleh berbuat demikian dalam Tetapan &gt;  Wayarles &amp; rangkaian."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Penyambungan boleh mengambil masa beberapa minit..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan."\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan."\n\n"Sentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Segerak didayakan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Segerak dilumpuhkan"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Ralat penyegerakan."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Menanti penyahpepijat sebelum aplikasi melaksana"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Lukisan"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Pemaparan dipercepat perkakasan"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Memantau"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Mod tegas didayakan"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Kelip skrin bila apl m\'buat oprsi pjg pd urtn utma"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Terbaik -&gt; terburuk: biru, hijau, merah muda, merah"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lumpuhkan tindihan atas HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Dayakan kesan"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Pilih kesan yang didayakan"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Tiada kesan didayakan"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> kesan kini didayakan"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Semua kesan kini didayakan"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Dayakan kesan OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Tunjukkan batas reka letak"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Tunjukkan batas klip, margin dll."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Paksa penggunaan GPU untuk lukisan 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Paksa 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Dayakan 4x MSAA dalam apl OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Nyahpepijat operasi keratan bukan segi empat tepat"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Penyerahan GPU profil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Ukur masa penyerahan dalam adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animasi tetingkap"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Skala animasi peralihan"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Skala tempoh juruanimasi"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Had proses latar belakang"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tunjukkan semua ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Tunjukkan dialog Aplikasi Tidak Memberi Maklum Balas untuk aplikasi latar belakang"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Gunakn WebView Eksperimen"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Apl akan menggunakan WebView (beta) terbaharu"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Penggunaan data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Kitaran penggunaan data"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Perayauan data"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hadkan data latar belakang"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Penggunaan 4G berasingan"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Tunjukkan penggunaan Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Tunjukkan penggunaan Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Tunjukkan penggunaan Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Tempat liputan mudah alih"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Auto-segerak data"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Tetapkan had data mudah alih"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Tetapkan had data 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Tetapkan had data 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Tetapkan had data Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Tetapkan had data Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mudah Alih"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan tablet anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sambungan data mudah alih anda akan dilumpuhkan apabila mencapai had tertentu."\n\n"Memandangkan telefon anda yang mengukur penggunaan data anda dan pembawa anda mungkin mengira penggunaan secara berbeza, pertimbangkan menggunakan had konservatif."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Hadkan data latar belakang?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jika anda menghadkan data mudah alih latar belakang, beberapa aplikasi dan perkhidmatan tidak akan berfungsi kecuali anda mendapat sambungan kepada rangkaian Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jika anda menghadkan data mudah alih latar belakang, beberapa apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jika anda mengehadkan data mudah alih latar belakang, sesetengah apl dan perkhidmatan tidak akan berfungsi melainkan anda bersambung ke rangkaian Wi-Fi."\n\n"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"amaran"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"had"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Apl dialih keluar"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan, kiraan tablet. Kiraan pembawa anda mungkin berbeza."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: kira-kira <xliff:g id="TOTAL">%1$s</xliff:g> digunakan - kiraan telefon. Kiraan pembawa anda mungkin berbeza."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Tempat liputan mudah alih"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Pilih rangkaian Wi-Fi yang merupakan tempat liputan mudah alih. Apl boleh disekat daripada menggunakan rangkaian ini semasa berada di latar belakang. Apl juga boleh memberi amaran sebelum menggunakan rangkaian ini untuk muat turun yang besar."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Pilih rangkaian Wi-Fi yang merupakan tempat liputan mudah alih. Apl boleh disekat daripada menggunakan rangkaian ini semasa berada di latar belakang. Apl juga boleh memberi amaran sebelum menggunakan rangkaian ini untuk muat turun yang besar."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Rangkaian mudah alih"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Rangkaian Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Untuk memilih tempat liputan mudah alih, hidupkan Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Rangkaian Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Untuk memilih tempat liputan mudah alih, hidupkan Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Panggilan kecemasan"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Kembali ke panggilan"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nama"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permisif"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Menguatkuasakan"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Anda"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Pengguna lain"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktif"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Tidak aktif"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Tambah pengguna atau profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil terhad"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Sebelum anda boleh membuat profil yang terhad, anda perlu menyediakan kunci skrin untuk melindungi apl dan data peribadi anda."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Tetapkan kunci"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Tidak disediakan"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Tidak disediakan - Profil terhad"</string>
     <string name="user_owner" msgid="3879126011135546571">"Pemilik"</string>
+    <string name="user_you" msgid="1639158809315025986">"Anda (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Nama samaran"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Tambah"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Pengguna mempunyai apl dan kandungan mereka sendiri"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Anda boleh menyekat akses kepada apl dan kandungan dari akaun anda"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Pengguna"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil terhad"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Tambah pengguna baharu"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri, yang mereka boleh peribadikan dengan apl mereka sendiri, kertas dinding dan sebagainya. Pengguna juga boleh melaraskan tetapan tablet seperti Wi-Fi yang melibatkan semua orang."\n\n"Selepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan."\n\n"Mana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Anda boleh berkongsi peranti ini dengan orang lain dengan membuat pengguna tambahan. Setiap pengguna mempunyai ruang mereka sendiri yang boleh diperibadikan dengan apl mereka sendiri, kertas dinding dan sebagainya. Pengguna juga boleh melaraskan tetapan tablet seperti Wi-Fi yang melibatkan semua orang."\n\n"Selepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan."\n\n"Mana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Selepas anda membuat pengguna baharu, orang itu perlu melalui proses persediaan."\n\n"Mana-mana pengguna boleh meluluskan kebenaran kemas kini apl bagi pihak pengguna lain."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sediakan pengguna sekarang?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Pastikan orang itu tersedia untuk mengambil tablet dan menyediakan ruangnya"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Sediakan profil sekarang?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Sediakan sekarang"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Bukan sekarang"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Hanya pemilik tablet boleh menguruskan pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Hanya pemilik telefon boleh menguruskan pengguna."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profil yang disekat tidak boleh menambah akaun"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Padam <xliff:g id="USER_NAME">%1$s</xliff:g> dari peranti"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Pengguna baharu"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Profil baharu"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Padam diri anda sendiri?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Alih keluar pengguna?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Alih keluar profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Anda akan kehilangan ruang dan data anda pada tablet ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Anda akan kehilangan ruang dan data anda pada telefon ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Ruang dan data pengguna ini akan hilang dari tablet ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Ruang dan data pengguna ini akan hilang dari telefon ini. Anda tidak boleh membuat asal tindakan ini."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Ruang dan data profil ini akan hilang dari tablet ini. Anda tidak boleh membuat asal tindakan ini."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Ruang dan data profil ini akan hilang dari telefon ini. Anda tidak boleh membuat asal tindakan ini."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Menambah pengguna baharu..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Padam pengguna"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Padam"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Tetapan ini melibatkan semua pengguna pada tablet ini."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Tetapan ini melibatkan semua pengguna pada telefon ini."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Tukar bahasa"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID Berfoto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis amaran kecemasan untuk dipaparkan."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Sekatan aplikasi dan kandungan"</string>
+    <string name="user_rename" msgid="8523499513614655279">"NAMAKAN SEMULA"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Tetapkan had aplikasi"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Benarkan pengubahsuaian perpasangan dan tetapan Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Benarkan pertukaran data apabila tablet menyentuh peranti lain"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Benarkan pertukaran data apabila telefon menyentuh peranti lain"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Akses lokasi"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Benarkan apl menggunakan maklumat lokasi anda"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Kembali"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Seterusnya"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Selesai"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Ambil foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Pilih foto dari Galeri"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 8a0bc5b..0a2c15e 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Langsom"</item>
     <item msgid="1145554631248513562">"Vanlig"</item>
     <item msgid="7553665153391107454">"Rask"</item>
-    <item msgid="2538100882620724753">"Svært rask"</item>
+    <item msgid="1370673569131070146">"Raskere"</item>
+    <item msgid="4648206845228970803">"Veldig rask"</item>
+    <item msgid="4977949754169483251">"Rask"</item>
+    <item msgid="6106302964845503577">"Veldig rask"</item>
+    <item msgid="6800277205640837264">"Raskest"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Svært lav"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"Passord"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Ingen"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Uspesifisert"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Ingen"</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">"Intern lagringsenhet"</item>
     <item msgid="3738430123799803530">"Flyttbart minnekort"</item>
     <item msgid="4498124044785815005">"La systemet bestemme"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Posisjon"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Meldinger"</item>
+    <item msgid="8971765125227378270">"Enhet"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"anslått posisjon"</item>
+    <item msgid="5789673140227507995">"nøyaktig posisjon"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrer"</item>
+    <item msgid="3434165993711230924">"lesing av kontakter"</item>
+    <item msgid="616161687718081936">"Endre kontaktene"</item>
+    <item msgid="7638002295329050091">"Lese anropsloggen"</item>
+    <item msgid="6546959730920410907">"Endre anropsloggen"</item>
+    <item msgid="446877710771379667">"lesing av kalender"</item>
+    <item msgid="7674458294386319722">"Endre kalenderen"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-skann"</item>
+    <item msgid="8694611243479480497">"varsel"</item>
+    <item msgid="7776439107987345446">"mobiltelefonskann"</item>
+    <item msgid="514615766544675057">"ring til telefon"</item>
+    <item msgid="8181415497109310680">"Les SMS"</item>
+    <item msgid="6816551144382117307">"Skriv SMS"</item>
+    <item msgid="4600463921908905030">"Motta SMS"</item>
+    <item msgid="5958926493289432745">"Motta nød-SMS"</item>
+    <item msgid="4945269495221089540">"Motta MMS"</item>
+    <item msgid="5570472453573929087">"Motta WAP-push"</item>
+    <item msgid="7125408150230860501">"Send SMS"</item>
+    <item msgid="7080337936612188061">"Les ICC SMS"</item>
+    <item msgid="587124103118495063">"Skriv ICC SMS"</item>
+    <item msgid="2320577158869025503">"Endre innstillingene"</item>
+    <item msgid="1545733463471924009">"tegn øverst"</item>
+    <item msgid="3609046903962454582">"varseltilgang"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"spill inn lyd"</item>
+    <item msgid="5031552983987798163">"spill av lyd"</item>
+    <item msgid="8374996688066472414">"lesing av utklippstavlen"</item>
+    <item msgid="3045529469061083747">"endring av utklippstavlen"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Sted"</item>
+    <item msgid="8677040780775113033">"Sted"</item>
+    <item msgid="1660743989948992916">"Sted"</item>
+    <item msgid="8791172739860195290">"Vibrer"</item>
+    <item msgid="383413555642128046">"Lesing av kontakter"</item>
+    <item msgid="3654594895269697313">"Endre kontaktene"</item>
+    <item msgid="7928393476362362538">"Les anropsloggen"</item>
+    <item msgid="6248591205254641116">"Endre anropsloggen"</item>
+    <item msgid="6093344633066170692">"Lesing av kalender"</item>
+    <item msgid="1334886368750347692">"Endre kalenderen"</item>
+    <item msgid="1638204101698708656">"Sted"</item>
+    <item msgid="2154671955760380322">"Send varsel"</item>
+    <item msgid="4282477730595931828">"Sted"</item>
+    <item msgid="4891423912898525905">"Ring til telefon"</item>
+    <item msgid="626463821668200388">"Motta SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Send SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Motta SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Motta SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Motta SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Motta SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Send SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Motta SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Send SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Endre innstillingene"</item>
+    <item msgid="736541391767350377">"Tegn øverst"</item>
+    <item msgid="5530815681721654194">"Varseltilgang"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Spill inn lyd"</item>
+    <item msgid="3493046322001257041">"Spill av lyd"</item>
+    <item msgid="136815868796597058">"Lesing av utklippstavlen"</item>
+    <item msgid="5238692940326972503">"Endring av utklippstavlen"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Middels"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafikk)"</item>
     <item msgid="1340692776955662664">"Ring stabel på glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Av"</item>
+    <item msgid="675719912558941285">"Merk område for ikke-rektangulær klipping blått"</item>
+    <item msgid="1064373276095698656">"Uthev testede tegnekommandoer grønt"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Av"</item>
+    <item msgid="2751513398307949636">"Viser på skjermen som stolper"</item>
+    <item msgid="8272260411216018353">"På skjermen som linjer"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standard grense"</item>
     <item msgid="4071574792028999443">"Ingen bakgrunnsprosesser"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 43802c3..7b9adf3 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -268,16 +268,16 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Flymodus"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mer"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløst og nettverk"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Trådløse nett, Bluetooth, flymodus, mobile nettverk, VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Administrer Wi-Fi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Koble til datatjenester ved roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Koble til datatjenester ved roaming"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Du har mistet datatilkobling fordi du forlot hjemmenettet med dataroaming av."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Slå på"</string>
-    <string name="roaming_warning" msgid="7625933694709170887">"Hvis du du tillater datastreifing, kan det påløpe høye kostnader."</string>
-    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillater datastreifing, kan dette føre til høye kostnader."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
-    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillater datastreifing, kan dette føre til høye kostnader."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillate datastreifing?"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"Å tillate roaming kan medføre høye datakostnader."</string>
+    <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Når du tillater roaming, kan dette føre til høye datakostnader."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Når du tillater roaming, kan dette føre til høye datakostnader."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vil du tillate roaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Operatør"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Velg en nettverksoperatør"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Skriv inn teksten som skal vises på låseskjermen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brukerinformasjon på låseskjermen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Brukerinformasjon"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Vis profilinformasjon på låseskjermen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformasjon"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Posisjonstilgang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Sikkerhet"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministrasjon"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Enhetsadministratorer"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Se eller deaktiver enhetsadministratorer"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå på Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Husk innstillinger"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Trådløs skjerm"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Slå på trådløs skjerm for å kunne se enheter."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Trådløs skjerm er deaktivert fordi Wi-Fi er slått av."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Trådløs skjerm er deaktivert fordi Wi-Fi er slått av."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Søk etter skjermer"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Søker …"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Fant ikke trådløse skjermer i nærheten."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Når denne funksjonen er slått på, kan du overføre appinnhold til en annen enhet som støtter nærfeltskommunikasjon (NFC). Du gjør dette ved å holde enhetene tett sammen. Du kan for eksempel trådløst overføre nettsider, YouTube-videoer, kontakter fra Personer og mye mer."\n\n"Du bare holder enhetene mot hverandre (helst rygg mot rygg), og trykker på skjermen. Appen avgjør hva som blir overført."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Oppdaging av nettverkstjenester"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillat at andre enheter oppdager apper på denne enheten"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Trådløst nett"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Slå på trådløst nett"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Innstillinger for trådløst nett"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Slå på Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Innstillinger for Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Sett opp og styr trådløse aksesspunkt"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Velg Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Slår på Wi-Fi …"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Slår av Wi-Fi …"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Velg Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Slår på Wi-Fi …"</string>
+    <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="3038290727701553612">"Varsle når et åpent 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="2466956369738047669">"Ikke bruk Wi-Fi-nettverk som ikke har stabil Internett-tilkobling"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Hold Wi-Fi aktivert i dvalemodus"</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_scan_always_available" msgid="3470564139944368030">"Skanning er alltid tilgjengelig"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Tillat at Googles posisjonstjeneste og andre apper skanner etter nettverk, selv når Wi-Fi er slått av"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer sertifikater"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"For å forbedre posisjonsnøyaktigheten, og for andre formål, kan Google og andre apper søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apper kan søke etter nettverk i nærheten, selv når Wi-Fi er slått av. Hvis du ikke vil at dette skal skje, går du til Avansert &gt; Skanning alltid tilgjengelig."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ikke vis igjen"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktivert i dvalemodus"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Det oppstod et problem under endring av innstillingen"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimalisering av Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimer batteribruk når Wi-Fi er på"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalisering av Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimer batteribruk når Wi-Fi er på"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Legg til nettverk"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Trådløse nettverk"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-nettverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Knapp for auto. WPS-lev."</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Flere alternativer"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Skriv inn WPS-kode"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Søker etter Wi-Fi-nettverk ..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Søker etter Wi-Fi-nettverk ..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har ikke tillatelse til å endre Wi-Fi-nettverk."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Annet nettverk"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Se mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk konfig. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"For å fullføre konfigurasjonen, må nettbrettet være tilkoblet Wi-Fi. Etter konfigurasjonen kan du bytte mellom mobildata og Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"For å fullføre konfigurasjonen, må nettbrettet være tilkoblet Wi-Fi. Etter konfigurasjonen kan du bytte mellom mobildata og Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Vis avanserte alternativer"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beskyttet Wi-Fi-konfigurasjon (WPS)"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS har allerede startet, og det kan ta opptil to minutter før den fullføres"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislyktes. Prøv igjen om noen minutter."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhetsinnstillingen (WEP) for trådløse rutere støttes ikke"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfeil. Prøv på nytt."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annen WPS-økt ble oppdaget. Prøv på nytt om noen minutter."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID for nettverket"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Skriv inn SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Sikkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrke"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Vil du tillate dette for alle apper som prøver å skanne?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Avvis"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Koble til"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan ikke koble til nettverket"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Slett"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Ikke hopp over"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren."\n\n"Nettbrettkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ADVARSEL: Du kan pådra deg ekstra datakostnader fra operatøren."\n\n"Telefonkonfigureringen kan kreve betydelig nettverksaktivitet."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ADVARSEL: Nettbrettet kommer ikke til å kunne bekrefte at programvaren din er oppdatert."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ADVARSEL: Telefonen kommer ikke til å kunne bekrefte at programvaren din er oppdatert."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Nettbrettet kunne ikke koble til Wi-Fi-nettverket."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonen kunne ikke koble til Wi-Fi-nettverket."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avansert Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensbånd"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ADVARSEL: Nettbrettet kan ikke bekrefte at programvaren din er oppdatert uten Internett-tilkobling."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ADVARSEL: Telefonen kan ikke bekrefte at programvaren din er oppdatert uten Internett-tilkobling."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Nettbrettet kunne ikke koble til Wi-Fi-nettverket."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonen kunne ikke koble til Wi-Fi-nettverket."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avanserte Wi-Fi-innstillinger"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi-frekvensbånd"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Angi operasjonens frekvensområde"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Det oppsto et problem med frekvensbåndet."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adresse"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Standardruter"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengde på nettv.prefiks"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Enhetsinformasjon"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Husk denne tilkoblingen"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Søk etter enheter"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du avbryte invitasjonen?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du avbryte invitasjonen til å koble til <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vil du glemme denne gruppen?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Flyttbar Wi-Fi-sone"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Slår på Wi-Fi-sone …"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Slår av trådløs sone …"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Flyttbar trådløs sone <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Flyttbar trådløs sone – feil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfigurer Wi-Fi-sone"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> flyttbar trådløs sone"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Feil med flyttbar Wi-Fi-sone"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurer 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> flyttbar Wi-Fi-sone"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signalstyrke"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Nettverk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-adresse for WLAN"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adresse for Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adresse"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ikke tilgjengelig"</string>
@@ -874,11 +896,13 @@
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"CHAP"</string>
     <string name="apn_type" msgid="469613123902220544">"APN-type"</string>
     <string name="apn_protocol" msgid="3272222921649348640">"APN-protokoll"</string>
-    <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN-protokoll ved streifing"</string>
+    <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN-protokoll ved roaming"</string>
     <string name="carrier_enabled" msgid="407655861175280806">"Aktivering eller deaktivering av APN"</string>
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN aktivert"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN er deaktivert"</string>
     <string name="bearer" msgid="594270280031923558">"Bærer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-verdi"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Slett APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lagre"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobile nettverk"</string>
     <string name="location_title" msgid="1029961368397484576">"Min posisjon"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi- og mobilnettverksposisjon"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"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="7457348712272184793">"Posisjon fastsatt av Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Posisjon fastsatt av Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satellitter"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Tillat at apper bruker GPS på nettbrettet til å finne den eksakte posisjonen din"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Tillat at apper bruker GPS på telefonen til å finne den eksakte posisjonen din"</string>
@@ -966,8 +990,8 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Bruk tjeneren til å hjelpe GPS (velg for å forbedre GPS-ytelsen)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Posisjon og Google-søk"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"La Google bruke posisjonen din til å forbedre søkeresultatene og andre tjenester"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Bruk av posisjonen min"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Tillat at at apper som har bedt om tillatelse bruker posisjonsinformasjonen din"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Bruk av posisjon"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"La apper som har bedt om tillatelse, bruke posisjonsinformasjonen din"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Posisjonskilder"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Om nettbrettet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Velg filteralternativer"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alle"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Deaktivert"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Hvis du deaktiverer en innebygd app kan det føre til at andre apper ikke fungerer som de skal. Dataene dine blir også slettet."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vil du deaktivere varsler?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Hvis du deaktiverer varsler for denne appen, kan du gå glipp av viktige beskjeder og oppdateringer."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Appkjøring"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Kjøres"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(aldri brukt)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Bruk av lagringsplass"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Vis lagring som brukes av apper"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Ord:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Snarvei:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Språk:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Skriv inn et ord"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Valgfri snarvei"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Rediger ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Rediger"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Slett"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Innstillinger for fysisk tastatur"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Utvikleralternativer"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Angi alternativer for apputvikling"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Utvikleralternativene er ikke tilgjengelige for denne brukeren"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug-modus når USB er koblet til"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Tilbakekall autorisasjoner for USB-feilsøking"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Feilrapporter i batterimenyen"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkluder alternativet for å utføre feilrapport i batterimenyen"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Forbli våken"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vil du aktivere utviklingsinnstillingene?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Disse innstillingene er bare beregnet for bruk under programutvikling. De kan forårsake problemer med enheten din og tilhørende apper."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Bekreft appene via USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Legg på med På-/Av-knappen"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Les inn passord"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"«Trykk på og hold inne»-forsinkelse"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Forbedre nettilgjengelighet"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Innstillinger"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tillatt"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ikke tillatt"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillat"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Ikke tillat"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Vil du bruke <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan samle inn all teksten du skriver, bortsett fra passord. Dette omfatter også personlige opplysninger som for eksempel kredittkortnumre. Tjenesten kan også samle inn data om samhandlingen din med nettbrettet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan samle inn all teksten du skriver, bortsett fra passord. Dette omfatter også personlige opplysninger som kredittkortnumre. Tjenesten kan også samle inn data om samhandlingen din med telefonen."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Du stopper <xliff:g id="SERVICE">%1$s</xliff:g> ved å trykke på OK."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observer handlingene dine"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Motta varsler når du samhandler med en app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Du stopper <xliff:g id="SERVICE">%1$s</xliff:g> ved å trykke på OK."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ingen tjenester er installert"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Trenger du en skjermleser?"</string>
-    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vil du at appene skal installere skripter fra Google som kan bidra til å gjøre nettinnholdet deres mer tilgjengelig?"</string>
+    <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Talkback gir muntlig tilbakemelding for å hjelpe blinde og svaksynte brukere. Vil du installere denne appen gratis fra Google Play?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Beskrivelse ble ikke oppgitt."</string>
     <string name="settings_button" msgid="3006713718908152930">"Innstillinger"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Lader"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skjerm på"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS på"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnettverkets signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi on time"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi on time"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi – aktivt i"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi – aktivt i"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Logg detaljer"</string>
     <string name="details_title" msgid="3792801565213935385">"Bruksdetaljer"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Juster strømforbruk"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pakker"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skjerm"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Trådløsnett"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Celle-standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Telefonsamtaler"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Prosessor i forgrunnen"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behold aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi kjører"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi kjører"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Nettbrett"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data sendt"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info om app"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Innstillinger for app"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Skjerminnstillinger"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Innstillinger for Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Innstillinger for Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Innstillinger for Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri brukt av telefonsamtaler"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri brukt når nettbrettet ikke er i bruk"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Bytt til flymodus for å spare strøm i områder uten mobildekning"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri brukt av skjermen og baklyset"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Skru ned lysstyrken og/eller tidsavbruddet for skjerm"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteri brukt av trådløsnettet"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Slå av Wi-Fi når du ikke bruker det, eller det ikke er tilgjengelig"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batteri brukt av Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Slå av Wi-Fi når du ikke bruker det, eller det ikke er tilgjengelig"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batteri brukt av Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Slå av Bluetooth når den ikke er i bruk"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Prøv å koble til en annen Bluetooth-enhet"</string>
@@ -1416,7 +1444,7 @@
     <string name="recognizer_settings_title" msgid="432493301215113154">"Talesøk"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Innstillinger for «<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>»"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Talesyntese-kontroller"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Tekst-til-tale-utdata"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Tekst-til-tale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Overstyr innstillinger"</string>
     <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>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurer"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Velg en annen motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Denne talesyntesemotoren kan samle inn all uttalt tekst, herunder personlige opplysninger som for eksempel passord og kredittkortnumre. Den er basert på motoren <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Vil du aktivere bruk av denne talesyntesemotoren?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Dette språket krever en fungerende nettverkstilkobling for tekst-til-tale."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorer"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Innstillinger for <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> er aktivert"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Foretrukket motor"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Generelt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Strømkontroll"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Oppdaterer innstilling for Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Oppdaterer innstilling for trådløst nett ..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Oppdatere Bluetooth-innstilling"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"på"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"av"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"slår på"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"slår av"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronisering"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle sertifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pålitelig legitimasjon"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis pålitelige CA-sertifikater"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Lagringstype"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarebasert"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Bare programvare"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn opplåsingsmønsteret"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,11 +1534,11 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sikkerhetskopier og gjenopprett"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personlige data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sikkerhetskopier data"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Sikkerhetskopier appdata, Wi-Fi-passord og andre innstillinger til Googles tjenere"</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="auto_restore_title" msgid="5397528966329126506">"Auto-gjenoppretting"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Når du installerer en app, bør du gjenopprette sikkerhetskopierte innstillinger og data"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Gjenopprett sikkerhetskopierte innstillinger og data når apper installeres"</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>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Det nye passordet stemmer ikke overens med bekreftelsen"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Det oppsto en feil under angivelsen av sikkerhetspassordet"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vil du stoppe sikkerhetskopiering av Wi-Fi-passord, bokmerker, andre innstillinger og appdata, samt slette alle kopier på Googles tjenere?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vil du stoppe sikkerhetskopiering av Wi-Fi-passord, bokmerker, andre innstillinger og appdata, samt slette alle kopier på Googles tjenere?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Innstillinger for enhetsadministrasjon"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministrator"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktiver"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Varsler"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Anropsringetone og vibrering"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi-konfigurering"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Koble til Wi-Fi-nettverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Kobler til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g> …"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi-konfigurasjon"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Koble til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Kobler til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g> …"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Legg til et nettverk"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ikke tilkoblet"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Legg til nettverk"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Kobler til …"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Gå til neste trinn"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP støttes ikke."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Du kan ikke konfigurere en EAP Wi-Fi-tilkobling under konfigurering. Etter konfigureringen kan dette gjøres i Innstillinger &gt; Trådløst og nettverk."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Du kan ikke konfigurere en EAP Wi-Fi-tilkobling under konfigurasjonen. Etter konfigurasjonen kan dette gjøres i Innstillinger &gt; Trådløst og nettverk."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Tilkoblingen kan ta noen minutter"</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Trykk på "<b>"Neste"</b>" for å fortsette oppsettet."\n\n"Trykk på "<b>"Tilbake"</b>" for å koble til et annet trådløst nettverk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Trykk på "<b>"Neste"</b>" for å fortsette konfigurasjonen."\n\n"Trykk på "<b>"Tilbake"</b>" for å koble til et annet Wi-Fi-nettverk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktivert"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering deaktivert"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfeil."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Feilsøkt app venter til feilsøkingsapp er lagt til før den kjører"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Inndata"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Tegning"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Maskinvareakselerert gjengivelse"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Overvåking"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Streng modus er aktivert"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Skjermblink når apper utfører lang handling på hovedtråd"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Fra best til verst: blå, grønn, lyserød, rød"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlegg"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Aktiver spor"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Velg aktiverte spor"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Ingen aktiverte spor for øyeblikket"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spor er aktivert for øyeblikket"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"For øyeblikket er alle sporene er aktiverte"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktiver OpenGL-spor"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Vis kantene i utformingen"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Vis kanter, marger osv."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Tving bruk av GPU for 2D-tegning"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Tving 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Aktiver 4x MSAA i OpenGL ES 2.0-apper"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Feilsøk ikke-rektangulær klipping"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU-gjengivelse av profil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mål gjengivelsestid i adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Animasjonsskala for vindu"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimasjonsskala"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Varighetsskala, animatør"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Bakgrunnsprosessgrense"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Vis alle ANR-er"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis dialogruten App svarer ikke for bakgr.apper."</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Bruk eksperimentell nettvisning"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Appene bruker den nyeste nettvisningen (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Databruk"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Databruksyklus"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Datastreifing"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begrensning av bakgrunnsdata"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separat 4G-bruk"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Vis Wi-Fi-bruk"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Vis Wi-Fi-bruk"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Vis Ethernet-bruk"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Wi-Fi-soner for mobiler"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Auto-synkronisering"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Angi datagrense for mobil"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Angi datagrense for 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Angi datagrense for 2G/3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Angi datagrense for Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Angi datagrense for Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,22 +1749,22 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av nettbrettet ditt, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildatatilkoblingen din blir deaktivert når angitt grense nås."\n\n"Ettersom databruken måles av telefonen din, som muligens bruker andre metoder for registrering av forbruk enn operatøren din, bør du angi en moderat grense."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrense bruken av bakgrunnsdata?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Hvis du begrenser bakgrunnsmobildata, kan det hende at enkelte apper og tjenester ikke fungerer med mindre du er koblet til et Wi-Fi-nettverk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet et Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet et Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Hvis du begrenser bakgrunnsmobildata, kan det hende at enkelte apper og tjenester ikke fungerer med mindre du er koblet til et Wi-Fi-nettverk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Hvis du begrenser mobildatabruk i bakgrunnen, fungerer ikke enkelte apper og tjenester med mindre du er tilkoblet Wi-Fi-nettverk."\n\n"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"advarsel"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"grense"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Fjernede apper"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Fjernede apper og brukere"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> mottatt, <xliff:g id="SENT">%2$s</xliff:g> sendt"</string>
-    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: omtrentlig forbruk på <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ca. <xliff:g id="TOTAL">%1$s</xliff:g> brukt"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: omtrentlig forbruk på <xliff:g id="TOTAL">%1$s</xliff:g>, målt av nettbrettet. Operatørens måling kan avvike."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: omtrentlig forbruk på <xliff:g id="TOTAL">%1$s</xliff:g>, målt av telefonen. Operatørens måling kan avvike."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Wi-Fi-soner for mobiler"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Velg et Wi-Fi-nettverk som er en Wi-Fi-sone for mobiler. Apper kan forhindres i å bruke disse nettverkene når de kjører i bakgrunnen. Du kan også motta en advarsel før apper bruker disse nettverkene for store nedlastninger."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Velg et Wi-Fi-nettverk som er en Wi-Fi-sone for mobiler. Apper kan forhindres i å bruke disse nettverkene når de kjører i bakgrunnen. Du kan også motta en advarsel før apper bruker disse nettverkene for store nedlastninger."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilnettverk"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-nettverk"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Slå på Wi-Fi for å velge Wi-Fi-soner for mobiler."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi-nettverk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Slå på Wi-Fi for å velge Wi-Fi-soner for mobiler."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nødanrop"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tilbake til anrop"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Navn"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Valgfri"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Håndhevende"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Brukere"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Deg"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andre brukere"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Legg til bruker"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Ikke aktiv"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Brukere og profiler"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Legg til en bruker eller profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begrenset profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Før du kan opprette en begrenset profil, må du konfigurere skjermlåsen for å beskytte appene og de personlige dataene dine."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Angi lås"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Ikke konfigurert"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ikke konfigurert – begrenset profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eier"</string>
+    <string name="user_you" msgid="1639158809315025986">"Deg (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Kallenavn"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Legg til"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Brukere har sine egne apper og eget innhold"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Du kan begrense tilgangen til apper og innhold fra kontoen din"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Bruker"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begrenset profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Legg til ny bruker"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Du kan dele denne enheten med andre personer ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi."\n\n"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dele denne enheten med andre personer ved å opprette flere brukere. Hver bruker får sitt eget område som de kan tilpasse med egne apper, bakgrunner osv. Brukere kan også tilpasse innstillinger på nettbrettet som påvirker alle, for eksempel for Wi-Fi."\n\n"Når du oppretter nye brukere, må de gå gjennom en konfigurasjonsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Når du oppretter nye brukere, må de gå gjennom en konfigureringsprosess."\n\n"Alle brukere kan godta oppdaterte apptillatelser på vegne av de andre brukerne."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurere brukeren nå?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Sørg for at personen er tilgjengelig for å bruke nettbrettet og konfigurere området sitt"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vil du konfigurere profilen nå?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurer nå"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ikke nå"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Bare eieren av nettbrettet kan administrere brukere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Bare eieren av telefonen kan administrere brukere."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begrensede profiler kan ikke legge til kontoer"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Slett <xliff:g id="USER_NAME">%1$s</xliff:g> fra denne enheten"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruker"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette deg selv?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Vil du slette brukeren?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vil du fjerne profilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Lagringsplassen og dataene dine blir fjernet fra dette nettbrettet. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Lagringsplassen og dataene dine blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Lagringsplassen og dataene for brukeren blir fjernet fra nettbrettet. Denne handlingen kan ikke angres."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Lagringsplassen og dataene for brukeren blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Lagringsplassen og dataene for profilen blir fjernet fra nettbrettet. Denne handlingen kan ikke angres."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Lagringsplassen og dataene for profilen blir fjernet fra telefonen. Denne handlingen kan ikke angres."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Legger til ny bruker …"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Slett bruker"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Slett"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Denne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Denne innstillingen påvirker alle brukerne på denne telefonen."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Bytt språk"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Kringkastede meldinger"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Velg hvilke nødvarsler som skal vises."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Begrensninger for apper og innhold"</string>
+    <string name="user_rename" msgid="8523499513614655279">"GI NYTT NAVN"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Tillat endring av Blutetooth-tilkoblinger og -innstillinger"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Tillat datautveksling når nettbrettet berører en annen enhet"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Tillat utveksling av data når telefonen berører en annen enhet"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Posisjonstilgang"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Lar apper bruke posisjonsinformasjon"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Tilbake"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Neste"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Fullfør"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Ta et bilde"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Velg bilde fra galleriet"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index 04fc1a8..320a2a1 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Langzaam"</item>
     <item msgid="1145554631248513562">"Normaal"</item>
     <item msgid="7553665153391107454">"Snel"</item>
-    <item msgid="2538100882620724753">"Zeer snel"</item>
+    <item msgid="1370673569131070146">"Vlug"</item>
+    <item msgid="4648206845228970803">"Behoorlijk vlug"</item>
+    <item msgid="4977949754169483251">"Snel"</item>
+    <item msgid="6106302964845503577">"Zeer snel"</item>
+    <item msgid="6800277205640837264">"Snelst"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Zeer laag"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Geen"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Niet opgegeven"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Geen"</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">"Interne apparaatopslag"</item>
     <item msgid="3738430123799803530">"Verwisselbare SD-kaart"</item>
     <item msgid="4498124044785815005">"Het systeem laten bepalen"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Locatie"</item>
+    <item msgid="255608127647030286">"Persoonlijk"</item>
+    <item msgid="4588829735729884491">"Berichten"</item>
+    <item msgid="8971765125227378270">"Apparaat"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"geschatte locatie"</item>
+    <item msgid="5789673140227507995">"nauwkeurige locatie"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"trillen"</item>
+    <item msgid="3434165993711230924">"contacten lezen"</item>
+    <item msgid="616161687718081936">"contacten aanpassen"</item>
+    <item msgid="7638002295329050091">"oproeplogboek lezen"</item>
+    <item msgid="6546959730920410907">"oproeplogboek aanpassen"</item>
+    <item msgid="446877710771379667">"agenda lezen"</item>
+    <item msgid="7674458294386319722">"agenda aanpassen"</item>
+    <item msgid="8281201165558093009">"wifi-scan"</item>
+    <item msgid="8694611243479480497">"melding"</item>
+    <item msgid="7776439107987345446">"mobiele scan"</item>
+    <item msgid="514615766544675057">"nummer bellen"</item>
+    <item msgid="8181415497109310680">"sms lezen"</item>
+    <item msgid="6816551144382117307">"sms schrijven"</item>
+    <item msgid="4600463921908905030">"sms ontvangen"</item>
+    <item msgid="5958926493289432745">"nood-sms ontvangen"</item>
+    <item msgid="4945269495221089540">"mms ontvangen"</item>
+    <item msgid="5570472453573929087">"WAP-push ontvangen"</item>
+    <item msgid="7125408150230860501">"sms verzenden"</item>
+    <item msgid="7080337936612188061">"ICC sms lezen"</item>
+    <item msgid="587124103118495063">"ICC sms schrijven"</item>
+    <item msgid="2320577158869025503">"instellingen aanpassen"</item>
+    <item msgid="1545733463471924009">"bovenop tekenen"</item>
+    <item msgid="3609046903962454582">"toegang tot meldingen"</item>
+    <item msgid="4671646036128214513">"camera"</item>
+    <item msgid="1097324338692486211">"audio opnemen"</item>
+    <item msgid="5031552983987798163">"audio afspelen"</item>
+    <item msgid="8374996688066472414">"klembord lezen"</item>
+    <item msgid="3045529469061083747">"klembord aanpassen"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Locatie"</item>
+    <item msgid="8677040780775113033">"Locatie"</item>
+    <item msgid="1660743989948992916">"Locatie"</item>
+    <item msgid="8791172739860195290">"Trillen"</item>
+    <item msgid="383413555642128046">"Contacten lezen"</item>
+    <item msgid="3654594895269697313">"Contacten aanpassen"</item>
+    <item msgid="7928393476362362538">"Oproeplogboek lezen"</item>
+    <item msgid="6248591205254641116">"Oproeplogboek aanpassen"</item>
+    <item msgid="6093344633066170692">"Agenda lezen"</item>
+    <item msgid="1334886368750347692">"Agenda aanpassen"</item>
+    <item msgid="1638204101698708656">"Locatie"</item>
+    <item msgid="2154671955760380322">"Melding verzenden"</item>
+    <item msgid="4282477730595931828">"Locatie"</item>
+    <item msgid="4891423912898525905">"Nummer bellen"</item>
+    <item msgid="626463821668200388">"Sms/mms ontvangen"</item>
+    <item msgid="1237538540368797101">"Sms/mms verzenden"</item>
+    <item msgid="3986142739951490025">"Sms/mms ontvangen"</item>
+    <item msgid="3984213795861739778">"Sms/mms ontvangen"</item>
+    <item msgid="3656243523752472788">"Sms/mms ontvangen"</item>
+    <item msgid="8105802370238551510">"Sms/mms ontvangen"</item>
+    <item msgid="1407766984645388488">"Sms/mms verzenden"</item>
+    <item msgid="1530132603376027248">"Sms/mms ontvangen"</item>
+    <item msgid="1188256962149204607">"Sms/mms verzenden"</item>
+    <item msgid="4218544235221631789">"Instellingen aanpassen"</item>
+    <item msgid="736541391767350377">"Bovenop tekenen"</item>
+    <item msgid="5530815681721654194">"Toegang tot meldingen"</item>
+    <item msgid="781213371706962767">"Camera"</item>
+    <item msgid="1720492593061838172">"Audio opnemen"</item>
+    <item msgid="3493046322001257041">"Audio afspelen"</item>
+    <item msgid="136815868796597058">"Klembord lezen"</item>
+    <item msgid="5238692940326972503">"Klembord aanpassen"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Normaal"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (graphics)"</item>
     <item msgid="1340692776955662664">"Oproepstack op glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Uit"</item>
+    <item msgid="675719912558941285">"Niet-rechthoekige bijsnijdregio tekenen in blauw"</item>
+    <item msgid="1064373276095698656">"Geteste tekenopdrachten markeren in groen"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Uit"</item>
+    <item msgid="2751513398307949636">"Op het scherm als balken"</item>
+    <item msgid="8272260411216018353">"Op het scherm als lijnen"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standaardlimiet"</item>
     <item msgid="4071574792028999443">"Geen achtergrondprocessen"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d6f0275..3684077 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Vliegmodus"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Meer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerken"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wifi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Verbinding maken met gegevensservices tijdens roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Verbinding maken met gegevensservices tijdens roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Typ tekst voor weergave op vergrendeld scherm"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Gebruikersgegevens weergeven op vergrendeld scherm"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Gebruikersgegevens"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profielinfo weergeven op vergrendelingsscherm"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profielinfo"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Locatietoegang"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Beveiliging"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
@@ -346,12 +348,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schermvergr. wijzigen"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Beveiliging via patroon, PIN of wachtwoord wijzigen of uitschakelen"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Kies een methode voor schermvergrendeling"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Hoe wilt u ontgrendelen als Face Unlock niet mogelijk is?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Hoe wilt u ontgrendelen als Ontgrendelen via gezichtsherkenning niet mogelijk is?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Geen"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Vegen"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Geen beveiliging"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</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>
@@ -362,7 +364,7 @@
     <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="5660014471997663139">"Vegen"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Apparaatbeheer"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Apparaatbeheerders"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Apparaatbeheerders weergeven of uitschakelen"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth inschakelen"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Instellingen onthouden"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Draadloze display"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Als u apparaten wilt zien, schakelt u draadloze display in."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Draadloze display wordt uitgeschakeld omdat wifi is uitgeschakeld."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Draadloze display wordt uitgeschakeld omdat wifi is uitgeschakeld."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Zoeken naar displays"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Zoeken…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Geen draadloze displays in de buurt."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer deze functie is ingeschakeld, kunt u app-inhoud overbrengen naar een ander NFC-apparaat door de apparaten bij elkaar te houden. U kunt bijvoorbeeld browserpagina\'s, YouTube-video\'s, contacten uit Personen, en nog veel meer overbrengen."\n\n"Houd de apparaten bij elkaar (meestal met de achterkanten tegen elkaar aan) en raak uw scherm aan. De app bepaalt wat er wordt overgebracht."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Netwerkservicedetectie"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Apps op andere apparaten toestaan apps op dit apparaat te detecteren"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Wi-Fi inschakelen"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi-instellingen"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wifi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wifi inschakelen"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wifi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wifi-instellingen"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Draadloze toegangspunten instellen en beheren"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wifi selecteren"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wifi inschakelen.."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wi-Fi uitschakelen…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wifi selecteren"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wifi inschakelen…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Wifi uitschakelen…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Fout"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"In vliegmodus"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan niet scannen naar netwerken"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Netwerkmelding"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Melden wanneer een open netwerk beschikbaar is"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wifi behouden in slaapstand"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Scannen altijd beschikbaar"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"De locatieservice en andere apps van Google laten scannen naar netwerken, zelfs wanneer wifi is uitgeschakeld"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Certificaten installeren"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Als u de nauwkeurigheid van locaties en voor andere doeleinden wilt verbeteren, kunnen Google en andere apps scannen naar netwerken in de buurt, zelfs wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Apps kunnen scannen naar netwerken in de buurt, zelfs wanneer wifi is uitgeschakeld. Als u niet wilt dat dit gebeurt, gaat u naar \'Geavanceerd\' &gt; \'Scannen altijd beschikbaar\'."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Niet opnieuw weergeven"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wifi behouden in slaapstand"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Er is een probleem opgetreden bij het wijzigen van de instelling"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wifi-optimalisatie"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Accugebruik minimaliseren wanneer wifi is ingeschakeld"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wifi-optimalisatie"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Accugebruik minimaliseren wanneer wifi is ingeschakeld"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Netwerk toevoegen"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-netwerken"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wifi-netwerken"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-knop"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Meer opties"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-pin"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wifi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netwerk vergeten"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Schakel Wi-Fi in om beschikbare netwerken te bekijken."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Wifi-netwerken zoeken..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Schakel wifi in om beschikbare netwerken te zien."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wifi-netwerken zoeken…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"U heeft geen toestemming om het wifi-netwerk te wijzigen."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Ander netwerk..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Meer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autom. config. (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Om de configuratie te voltooien, heeft uw tablet toegang tot wifi nodig. Na de configuratie kunt u schakelen tussen mobiele gegevens en wifi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Om de configuratie te voltooien, heeft uw tablet toegang tot wifi nodig. Na de configuratie kunt u schakelen tussen mobiele gegevens en wifi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Geavanceerde opties weergeven"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beveiligde configuratie voor wifi"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS wordt al uitgevoerd en het kan twee minuten duren voordat dit proces is voltooid"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS is mislukt. Probeer het over enkele minuten opnieuw."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"De beveiligingsinstelling voor de draadloze router (WEP) wordt niet ondersteund"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Authenticatie is mislukt. Probeer het opnieuw."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Er is een andere WPS-sessie gedetecteerd. Probeer het over een paar minuten opnieuw."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID van netwerk"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Geef de SSID op"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Beveiliging"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signaalsterkte"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Dit toestaan voor alle apps die willen scannen?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Afwijzen"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Verbinden"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Vergeten"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Niet overslaan"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht."\n\n"Het instellen van de tablet kan aanzienlijke netwerkactiviteit vereisen."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"WAARSCHUWING: er worden mogelijk extra kosten voor dataverkeer in rekening gebracht."\n\n"Het instellen van de telefoon kan aanzienlijke netwerkactiviteit vereisen."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"WAARSCHUWING: de tablet kan niet controleren of uw software is bijgewerkt."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"WAARSCHUWING: de telefoon kan niet verifiëren of uw software is bijgewerkt."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"De telefoon kan geen verbinding maken met dit wifi-netwerk."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Geavanceerde Wi-Fi-instellingen"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frequentieband"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"LET OP: totdat u een internetverbinding heeft, kan de tablet niet verifiëren dat uw software actueel is."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"LET OP: totdat u een internetverbinding heeft, kan de telefoon niet verifiëren dat uw software actueel is."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"De tablet kan geen verbinding maken met dit wifi-netwerk."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"De telefoon kan geen verbinding maken met dit wifi-netwerk."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Geavanceerde wifi-instellingen"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wifi-frequentieband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Het frequentiebereik voor gebruik opgeven"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Probleem bij instellen van het frequentiebeleid."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-adres"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lengte van netwerkprefix"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wifi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Apparaatgegevens"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Deze verbinding onthouden"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Apparaten zoeken"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Uitnodiging annuleren?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wilt u de uitnodiging voor verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> annuleren?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Deze groep vergeten?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Draagbare wifi-hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot inschakelen…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot uitschakelen…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Draagbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actief"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met draagbare Wi-Fi-hotspot"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wifi-hotspot instellen"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> draagbare Wi-Fi-hotspot"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Fout met draagbare wifi-hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wifi-hotspot instellen"</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="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signaalsterkte"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Netwerk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC-adres"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-adres voor wifi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adres"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Niet beschikbaar"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ingeschakeld"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN uitgeschakeld"</string>
     <string name="bearer" msgid="594270280031923558">"Drager"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-type"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-waarde"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN verwijderen"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nieuwe APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Opslaan"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Help"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobiele netwerken"</string>
     <string name="location_title" msgid="1029961368397484576">"Mijn locatie"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wifi en mobiele netwerklocatie"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wifi en mobiele netwerklocatie"</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="7457348712272184793">"Locatie bepaald via Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locatie bepaald via wifi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satellieten"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Apps toestaan GPS op uw tablet te gebruiken om uw locatie te bepalen"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Apps toestaan GPS op uw telefoon te gebruiken om uw locatie te bepalen"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filteropties kiezen"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alles"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Uitgeschakeld"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Gedownload"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Wordt uitgevoerd"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-opslag"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Als u een ingebouwde app uitschakelt, functioneren andere apps mogelijk niet meer correct. Uw gegevens worden ook verwijderd."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Meldingen uitschakelen?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Als u meldingen voor deze app uitschakelt, mist u misschien belangrijke waarschuwingen en updates."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"App-bewerkingen"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Actief"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nooit gebruikt)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Opslaggebruik"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Gebruikte opslagruimte voor apps weergeven"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
@@ -1220,10 +1248,12 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Woord:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Sneltoets:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Taal:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Typ een woord"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Optionele snelkoppeling"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Woord bewerken"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Bewerken"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Verwijderen"</string>
-    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Er staan geen woorden in het gebruikerswoordenboek. U kunt een woord toevoegen door de knop \'Toevoegen\' (+) aan te raken."</string>
+    <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Er staan geen woorden in het gebruikerswoordenboek. U kunt een woord toevoegen door op de knop \'Toevoegen\' (+) te tikken."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Voor alle talen"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Meer talen..."</string>
     <string name="testing" msgid="6584352735303604146">"Testen"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Instellingen voor vast toetsenbord"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opties voor ontwikkelaars"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Opties instellen voor appontwikkeling"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Ontwikkelaarsopties zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Foutopsporingsmodus bij USB-verbinding"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Autorisatie voor USB-foutopsporing intrekken"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Foutenrapporten in afsluitmenu"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Optie opnemen in afsluitmenu voor het genereren van een foutenrapport"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Stand-by"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ontwikkelingsinstellingen toestaan?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Deze instellingen zijn uitsluitend bedoeld voor ontwikkelingsgebruik. Uw apparaat en apps kunnen hierdoor vastlopen of anders reageren."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Apps verifiëren via USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Aan/uit-knop beëindigt oproep"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Wachtwoorden voorlezen"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Vertraging voor blijven aanraken"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Webtoegankelijkheid verbeteren"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Instellingen"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Aan"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Uit"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Toegestaan"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Niet toegestaan"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Toestaan"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Niet toestaan"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g> gebruiken?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan alle tekst registreren die u typt, behalve wachtwoorden. Deze tekst kan ook persoonlijke gegevens zoals creditcardnummers omvatten. Er kunnen ook gegevens worden verzameld over uw interacties met de tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan alle tekst registreren die u typt, behalve wachtwoorden. Deze tekst kan ook persoonlijke gegevens zoals creditcardnummers omvatten. Er kunnen ook gegevens worden verzameld over uw interacties met de telefoon."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g> beëindigen?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Als u \'OK\' aanraakt, wordt <xliff:g id="SERVICE">%1$s</xliff:g> beëindigd."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Uw acties observeren"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Meldingen ontvangen wanneer u een app gebruikt."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> beëindigen?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Als u \'OK\' aanraakt, wordt <xliff:g id="SERVICE">%1$s</xliff:g> beëindigd."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Geen services geïnstalleerd"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Heeft u een schermlezer nodig?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack levert gesproken feedback om blinde en slechtziende gebruikers te helpen navigeren. Wilt u deze app gratis installeren via Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Wilt u dat apps scripts installeren van Google waardoor de webinhoud van de apps toegankelijker wordt?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Geen beschrijving opgegeven."</string>
     <string name="settings_button" msgid="3006713718908152930">"Instellingen"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Opladen"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Scherm aan"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ingeschakeld"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wifi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ingeschakeld"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signaal mobiel netwerk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi op tijd"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi op tijd"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wifi op tijd"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wifi op tijd"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Geschiedenisdetails"</string>
     <string name="details_title" msgid="3792801565213935385">"Gebruiksdetails"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Energieverbruik aanpassen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Bijgeleverde pakketten"</string>
     <string name="power_screen" msgid="3023346080675904613">"Scherm"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobiel stand-by"</string>
     <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU op voorgrond"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ingeschakeld houden"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi actief"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wifi actief"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefoon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gegevens verzonden"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"App-info"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"App-instellingen"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Scherminstellingen"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi-instellingen"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wifi-instellingen"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-instellingen"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Accu gebruikt door spraakoproepen"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Accu gebruikt wanneer tablet inactief is"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Schakel over naar de vliegmodus om energie te besparen in gebieden zonder mobiel bereik"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Accu gebruikt door scherm en achtergrondverlichting"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Verlaag de helderheid van het scherm en/of geef een kortere time-out voor het scherm op"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Accu gebruikt door Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Schakel wifi uit wanneer u dit niet gebruikt of wanneer dit niet beschikbaar is"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Accu gebruikt door wifi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Schakel wifi uit wanneer u dit niet gebruikt of wanneer dit niet beschikbaar is"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Accu gebruikt door Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Schakel Bluetooth uit wanneer u deze functie niet gebruikt"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Probeer verbinding te maken met een ander Bluetooth-apparaat"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configureren"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Een andere engine kiezen"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Deze engine voor spraaksynthese kan mogelijk alle tekst verzamelen die wordt gesproken, waaronder persoonlijke gegevens zoals wachtwoorden en creditcardnummers. Deze engine is afkomstig van de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-engine. Het gebruik van deze engine voor spraaksynthese inschakelen?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Deze taal heeft een werkende netwerkverbinding nodig voor tekst-naar-spraak-uitvoer."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Engines"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Instellingen voor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> is ingeschakeld"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Voorkeursengine"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Algemeen"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Energiebeheer"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Wi-Fi-instelling bijwerken"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wifi-instelling bijwerken"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth-instelling bijwerken"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"aan"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"uit"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"inschakelen"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"uitschakelen"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wifi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wifi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronisatie"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Opslagtype"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Ondersteund door hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Alleen software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Back-up en herstel"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Persoonlijke gegevens"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Back-up maken van mijn gegevens"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Een back-up van gegevens voor apps, wifi-wachtwoorden en andere instellingen maken op de Google-servers"</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="auto_restore_title" msgid="5397528966329126506">"Automatisch terugzetten"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nieuw wachtwoord en bevestiging komen niet overeen."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Instellen van back-upwachtwoord is mislukt"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Weet u zeker dat u het maken van back-ups van uw wifi-wachtwoorden, bladwijzers, andere instellingen en gegevens voor apps wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Weet u zeker dat u het maken van back-ups van uw wifi-wachtwoorden, bladwijzers, andere instellingen en gegevens voor apps wilt stoppen en alle kopieën op Google-servers wilt wissen?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Instellingen voor apparaatbeheer"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Apparaatbeheerder"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deactiveren"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Meldingen"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Beltoon en trillen"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Systeem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Instellen van Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Verbinding maken met Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Verbinding maken met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Verbonden met een Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wifi-configuratie"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Verbinding maken met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Verbinding maken met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Een netwerk toevoegen"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Geen verbinding"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Netwerk toevoegen"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Verbinding maken..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Doorgaan naar de volgende stap"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP wordt niet ondersteund."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"U kunt een wifi-verbinding van het type EAP niet configureren tijdens het instellen. U kunt dit na het instellen doen via \'Instellingen\' &gt; \'Draadloos en netwerken\'."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"U kunt een wifi-verbinding van het type EAP niet configureren tijdens het instellen. U kunt dit na het instellen doen via \'Instellingen\' &gt; \'Draadloos en netwerken\'."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Verbinding maken kan enkele minuten duren..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie."\n\n"Raak "<b>"Terug"</b>" aan om verbinding te maken met een ander Wi-Fi-netwerk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie."\n\n"Raak "<b>"Terug"</b>" aan om verbinding te maken met een ander wifi-netwerk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisatie is ingeschakeld"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchroniseren uitgeschakeld"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisatiefout."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Gedebugde app wacht op koppelen van debugger vóór uitvoering"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Invoer"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Tekening"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Rendering met hardwareversnelling"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Controle"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strikte modus ingeschakeld"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Knipperend scherm bij lange bewerkingen door apps"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Best naar slechtst: blauw, groen, lichtrood, rood"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW-overlays uitschakelen"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Sporen inschakelen"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Ingeschakelde sporen selecteren"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Er zijn momenteel geen sporen ingeschakeld"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> sporen zijn momenteel ingeschakeld"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alle sporen zijn momenteel ingeschakeld"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL-sporen inschakelen"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Indelingsgrenzen weerg."</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Clipgrenzen, marges en meer weergeven."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Gebruik van GPU voor 2D-tekening forceren"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA forceren"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"4x MSAA inschakelen in OpenGL ES 2.0-apps"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Fouten met niet-rechthoekige bijsnijdbewerkingen opsporen"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU-rendering van profiel"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Renderingtijd in adb shell dumpsys gfxinfo meten"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Vensteranimatieschaal"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Overgangsanimatieschaal"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Duur van animatieschaal"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Achtergrondproceslimiet"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Alle ANR\'s weergeven"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"\'App reageert niet\' weerg. voor apps op achtergr."</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Experimentele WebView gebruiken"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Apps gebruiken de nieuwste WebView (bèta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Gegevensgebruikcyclus"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Gegevensroaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Achtergrondgegevens beperken"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"4G-gebruik apart weergeven"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Wi-Fi-gebruik weergeven"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Wifi-gebruik weergeven"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet-gebruik weergeven"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobiele hotspots"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Gegevens automatisch synchroniseren"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Mobiele gegevenslimiet instellen"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G-gegevenslimiet instellen"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G-gegevenslimiet instellen"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Wifi-gegevenslimiet instellen"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Wifi-datalimiet instellen"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wifi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobiel"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw tablet en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uw mobiele gegevensverbinding wordt uitgeschakeld wanneer de gespecificeerde limiet is bereikt."\n\n"Aangezien dit gegevensverbruik wordt gemeten door uw telefoon en uw provider tot een ander totaal kan komen, kunt u het beste een voorzichtige grens instellen."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Achtergrondgegevens beperken?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Als u het gebruik van mobiele achtergrondgegevens beperkt, werken sommige apps en services niet, tenzij u bent verbonden met een wifi-netwerk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Als u het gebruik van mobiele achtergrondgegevens beperkt, werken sommige apps en services niet, tenzij u bent verbonden met een wifi-netwerk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Als u mobiel gegevensgebruik op de achtergrond beperkt, werken sommige apps en services niet, tenzij u verbonden bent met een wifi-netwerk."\n\n"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"waarschuwing"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwijderde apps"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt volgens uw tablet. Uw provider kan dit anders berekenen."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruikt volgens uw telefoon. Uw provider kan dit anders berekenen."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobiele hotspots"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecteer de wifi-netwerken die mobiele hotspots zijn. Het gebruik van deze netwerken op de achtergrond kan in apps worden beperkt. Apps kunnen ook waarschuwen voordat deze netwerken worden gebruikt voor grote downloads."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecteer de wifi-netwerken die mobiele hotspots zijn. Het gebruik van deze netwerken op de achtergrond kan in apps worden beperkt. Apps kunnen ook waarschuwen voordat deze netwerken worden gebruikt voor grote downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobiele netwerken"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wifi-netwerken"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Schakel wifi in om mobiele hotspots te selecteren."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wifi-netwerken"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Schakel wifi in om mobiele hotspots te selecteren."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Terug naar gesprek"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Tolerant)"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Wordt afgedwongen)"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Gebruikers"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"U"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andere gebruikers"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Gebruiker toevoegen"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Actief"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Niet actief"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Gebruikers en profielen"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Gebruiker of profiel toevoegen"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Beperkt profiel"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Voordat u een beperkt profiel kunt maken, moet u een schermvergrendeling instellen om uw apps en persoonlijke gegevens te beschermen."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Vergrendeling instellen"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Niet ingesteld"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Niet ingesteld - Beperkt profiel"</string>
     <string name="user_owner" msgid="3879126011135546571">"Eigenaar"</string>
+    <string name="user_you" msgid="1639158809315025986">"U (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Bijnaam"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Toevoegen"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Gebruikers hebben hun eigen apps en inhoud"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"U kunt toegang tot apps en inhoud vanuit uw account beperken"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Gebruiker"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Beperkt profiel"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Nieuwe gebruiker toevoegen"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft een eigen ruimte die kan worden aangepast met eigen apps, een achtergrond, enzovoort. Gebruikers kunnen ook tabletinstellingen aanpassen, zoals wifi, die effect hebben op alle gebruikers."\n\n"Nadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen."\n\n"Elke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"U kunt dit apparaat met andere mensen delen door extra gebruikers te maken. Elke gebruiker heeft een eigen ruimte die kan worden aangepast met eigen apps, een achtergrond, enzovoort. Gebruikers kunnen ook tabletinstellingen aanpassen, zoals wifi, die effect hebben op alle gebruikers."\n\n"Nadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen."\n\n"Elke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Nadat u een nieuwe gebruiker heeft gemaakt, moet die persoon een configuratieproces volgen."\n\n"Elke gebruiker kan namens alle andere gebruikers bijgewerkte app-machtigingen accepteren."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Gebruiker nu instellen?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Zorg ervoor dat de persoon de tablet kan overnemen om zijn of haar eigen gedeelte te configureren"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profiel nu instellen?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nu instellen"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Niet nu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Alleen de eigenaar van de tablet kan gebruikers beheren."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Alleen de eigenaar van de telefoon kan gebruikers beheren."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Beperkte profielen kunnen geen accounts toevoegen"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> verwijderen van dit apparaat"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nieuwe gebruiker"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nieuw profiel"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Wilt u uzelf verwijderen?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Gebruiker verwijderen?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Profiel verwijderen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"U raakt uw opslagruimte en gegevens op deze tablet kwijt. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"U raakt uw opslagruimte en gegevens op deze telefoon kwijt. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"De opslagruimte en gegevens van deze gebruiker verdwijnen van deze tablet. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"De opslagruimte en gegevens van deze gebruiker verdwijnen van deze telefoon. U kunt deze actie niet ongedaan maken."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"De opslagruimte en gegevens van dit profiel verdwijnen van deze tablet. U kunt deze actie niet ongedaan maken."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"De opslagruimte en gegevens van dit profiel verdwijnen van deze telefoon. U kunt deze actie niet ongedaan maken."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Nieuwe gebruiker toevoegen…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Gebruiker verwijderen"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Verwijderen"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Deze instelling is van invloed op alle gebruikers van deze tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Deze instelling is van invloed op alle gebruikers van deze telefoon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Taal wijzigen"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecteer de typen noodoproepen die moeten worden weergegeven."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Beperkingen voor apps en inhoud"</string>
+    <string name="user_rename" msgid="8523499513614655279">"NAAM WIJZIGEN"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"App-limieten 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Aanpassing van Bluetooth-koppelingen en -instellingen toestaan"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Gegevensuitwisseling toestaan wanneer de tablet een ander apparaat fysiek raakt"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Gegevensuitwisseling toestaan wanneer de telefoon een ander apparaat fysiek raakt"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Locatietoegang"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Apps uw locatiegegevens laten gebruiken"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Terug"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Volgende"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Voltooien"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Foto maken"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Foto kiezen in Galerij"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 3584b5f..1a10173 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Wolno"</item>
     <item msgid="1145554631248513562">"Normalnie"</item>
     <item msgid="7553665153391107454">"Szybko"</item>
-    <item msgid="2538100882620724753">"Bardzo szybko"</item>
+    <item msgid="1370673569131070146">"Trochę szybciej"</item>
+    <item msgid="4648206845228970803">"Szybciej"</item>
+    <item msgid="4977949754169483251">"Jeszcze szybciej"</item>
+    <item msgid="6106302964845503577">"Bardzo szybko"</item>
+    <item msgid="6800277205640837264">"Najszybciej"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Bardzo niskie"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Brak"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brak"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nie określono"</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">"Wewnętrzna pamięć urządzenia"</item>
     <item msgid="3738430123799803530">"Wymienna karta SD"</item>
     <item msgid="4498124044785815005">"Zastosuj ustawienie systemowe"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Lokalizacja"</item>
+    <item msgid="255608127647030286">"Osobiste"</item>
+    <item msgid="4588829735729884491">"Wiadomości"</item>
+    <item msgid="8971765125227378270">"Urządzenie"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"przybliżona lokalizacja"</item>
+    <item msgid="5789673140227507995">"dokładna lokalizacja"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"wibracje"</item>
+    <item msgid="3434165993711230924">"odczytywanie kontaktów"</item>
+    <item msgid="616161687718081936">"modyfikowanie kontaktów"</item>
+    <item msgid="7638002295329050091">"odczytywanie rejestru połączeń"</item>
+    <item msgid="6546959730920410907">"modyfikowanie rejestru połączeń"</item>
+    <item msgid="446877710771379667">"odczytywanie kalendarza"</item>
+    <item msgid="7674458294386319722">"modyfikowanie kalendarza"</item>
+    <item msgid="8281201165558093009">"skanowanie wi-fi"</item>
+    <item msgid="8694611243479480497">"powiadomienie"</item>
+    <item msgid="7776439107987345446">"skanowanie bts"</item>
+    <item msgid="514615766544675057">"połączenia telefoniczne"</item>
+    <item msgid="8181415497109310680">"odczytywanie SMS-ów"</item>
+    <item msgid="6816551144382117307">"zapisywanie SMS-ów"</item>
+    <item msgid="4600463921908905030">"odbieranie SMS-ów"</item>
+    <item msgid="5958926493289432745">"odbieranie SMS-ów alarmowych"</item>
+    <item msgid="4945269495221089540">"odbieranie MMS-ów"</item>
+    <item msgid="5570472453573929087">"odbieranie wiadomości WAP push"</item>
+    <item msgid="7125408150230860501">"wysyłanie SMS-ów"</item>
+    <item msgid="7080337936612188061">"odczytywanie SMS-ów ICC"</item>
+    <item msgid="587124103118495063">"zapisywanie SMS-ów ICC"</item>
+    <item msgid="2320577158869025503">"modyfikowanie ustawień"</item>
+    <item msgid="1545733463471924009">"rysuj na górze"</item>
+    <item msgid="3609046903962454582">"dostęp do powiadomień"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"nagraj dźwięk"</item>
+    <item msgid="5031552983987798163">"odtwórz dźwięk"</item>
+    <item msgid="8374996688066472414">"czytaj schowek"</item>
+    <item msgid="3045529469061083747">"modyfikuj schowek"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokalizacja"</item>
+    <item msgid="8677040780775113033">"Lokalizacja"</item>
+    <item msgid="1660743989948992916">"Lokalizacja"</item>
+    <item msgid="8791172739860195290">"Wibracje"</item>
+    <item msgid="383413555642128046">"Odczytywanie kontaktów"</item>
+    <item msgid="3654594895269697313">"Modyfikowanie kontaktów"</item>
+    <item msgid="7928393476362362538">"Odczytywanie rejestru połączeń"</item>
+    <item msgid="6248591205254641116">"Modyfikowanie rejestru połączeń"</item>
+    <item msgid="6093344633066170692">"Odczytywanie kalendarza"</item>
+    <item msgid="1334886368750347692">"Modyfikowanie kalendarza"</item>
+    <item msgid="1638204101698708656">"Lokalizacja"</item>
+    <item msgid="2154671955760380322">"Publikowanie powiadomień"</item>
+    <item msgid="4282477730595931828">"Lokalizacja"</item>
+    <item msgid="4891423912898525905">"Połączenia telefoniczne"</item>
+    <item msgid="626463821668200388">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="1237538540368797101">"Wysyłanie SMS-ów/MMS-ów"</item>
+    <item msgid="3986142739951490025">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="3984213795861739778">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="3656243523752472788">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="8105802370238551510">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="1407766984645388488">"Wysyłanie SMS-ów/MMS-ów"</item>
+    <item msgid="1530132603376027248">"Odbieranie SMS-ów/MMS-ów"</item>
+    <item msgid="1188256962149204607">"Wysyłanie SMS-ów/MMS-ów"</item>
+    <item msgid="4218544235221631789">"Modyfikowanie ustawień"</item>
+    <item msgid="736541391767350377">"Rysuj na górze"</item>
+    <item msgid="5530815681721654194">"Dostęp do powiadomień"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Nagraj dźwięk"</item>
+    <item msgid="3493046322001257041">"Odtwórz dźwięk"</item>
+    <item msgid="136815868796597058">"Czytaj schowek"</item>
+    <item msgid="5238692940326972503">"Modyfikuj schowek"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krótkie"</item>
     <item msgid="2560532955514699713">"Średnie"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"Stos wywołań funkcji glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Wył."</item>
+    <item msgid="675719912558941285">"Rysuj nieprostokątny region przycinania na niebiesko"</item>
+    <item msgid="1064373276095698656">"Wyróżnij testowane polecenia rysowania na zielono"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Wył."</item>
+    <item msgid="2751513398307949636">"Na ekranie w postaci pasków"</item>
+    <item msgid="8272260411216018353">"Na ekranie w postaci linii"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardowy limit"</item>
     <item msgid="4071574792028999443">"Brak procesów w tle"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 6db0d54..3705e41 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -268,8 +268,8 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Tryb samolotowy"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Więcej..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sieci zwykłe i bezprzewodowe"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Zarządzaj połączeniami Wi-Fi i Bluetooth, trybem samolotowym, sieciami komórkowymi i VPN."</string>
-    <string name="roaming" msgid="3596055926335478572">"Dane w roamingu"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Zarządzaj połączeniami Wi-Fi i Bluetooth, trybem samolotowym, sieciami komórkowymi i VPN"</string>
+    <string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Połącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Połącz z usługami transmisji danych w roamingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Połączenie transmisji danych zostało utracone, ponieważ opuszczono sieć macierzystą przy wyłączonej opcji danych w roamingu."</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Wpisz tekst do wyświetlenia na ekranie blokady."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaż informacje o użytkowniku na zablokowanym ekranie"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Użytkownik – informacje"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Pokaż informacje o profilu na ekranie blokady"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informacje o profilu"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Dostęp do lokalizacji"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpieczenia"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administracja urządzeniem"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administratorzy urządzenia"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Wyświetl lub dezaktywuj administratorów urządzenia"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Włącz Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Aby zobaczyć urządzenia, włącz wyświetlacz bezprzewodowy."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wyświetlacz bezprzewodowy jest wyłączony, ponieważ wyłączone jest Wi-Fi."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Wyświetlacz bezprzewodowy jest wyłączony, ponieważ wyłączone jest Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Wyszukaj wyświetlacze"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Wyszukuję…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nie znaleziono wyświetlaczy bezprzewodowych w pobliżu."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając oba aparaty do siebie. Możliwe jest na przykład przesłanie stron z przeglądarki, filmów z YouTube, kontaktów z telefonu itp."\n\n"Wystarczy zetknąć urządzenia ze sobą i dotknąć ekranu. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Wykrywanie usług sieciowych"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Zezwól aplikacjom z innych urządzeń wykrywać aplikacje na tym urządzeniu"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Włącz Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Ustawienia Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Włącz Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Ustawienia Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wybierz Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Włączanie Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Wyłączanie Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Wybierz Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Włączam Wi-Fi…"</string>
+    <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="3038290727701553612">"Powiadom mnie, gdy będę w zasięgu otwartej sieci"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unikaj słabych połączeń"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nie łącz z Wi-Fi, jeśli połączenie jest słabe"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi w trybie uśpienia"</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_scan_always_available" msgid="3470564139944368030">"Skanowanie zawsze dostępne"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Pozwól usłudze lokalizacji Google i innym aplikacjom szukać sieci, nawet gdy sieć Wi-Fi jest wyłączona"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaluj certyfikaty"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Aby poprawić dokładność lokalizacji (i w innych celach), aplikacje Google i inne mogą skanować sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacje mogą wyszukiwać sieci w pobliżu, nawet gdy Wi-Fi jest wyłączone. Jeśli nie chcesz, aby tak się działo, wybierz Zaawansowane &gt; Skanowanie zawsze dostępne."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nie pokazuj ponownie"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Nie wyłączaj Wi-Fi w trybie uśpienia"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Wystąpił problem ze zmianą ustawienia"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optymalizacja Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalizuj zużycie baterii po włączeniu Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optymalizacja Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizuj zużycie baterii po włączeniu Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj sieć"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Sieci Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Sieci Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Przycisk WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Więcej opcji"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kod PIN dla WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zapomnij sieć"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Aby zobaczyć dostępne sieci, włącz obsługę Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Wyszukuję sieci Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aby zobaczyć dostępne sieci, włącz Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wyszukuję sieci Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nie masz uprawnień do zmiany sieci Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Inna sieć…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Więcej"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Autokonfiguracja (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Do ukończenia konfiguracji tablet potrzebuje połączenia z Wi-Fi. Potem będziesz mieć możliwość przełączania między przesyłaniem danych przez sieć komórkową i Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Do ukończenia konfiguracji tablet potrzebuje dostępu do Wi-Fi. Potem można przełączać się między przesyłaniem danych przez sieć komórkową i Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Opcje zaawansowane"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Konfiguracja zabezpieczonej sieci Wi-Fi"</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="7204827509934892103">"Naciśnij przycisk konfiguracji zabezpieczonej sieci Wi-Fi na routerze. Może on mieć nazwę „WPS” lub ten symbol:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Konfiguracja WPS już się rozpoczęła i może potrwać do dwóch minut"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Konfiguracja WPS nie powiodła się. Spróbuj ponownie za kilka minut."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ustawienie zabezpieczeń routera bezprzewodowego (WEP) nie jest obsługiwane"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Błąd uwierzytelniania. Spróbuj ponownie."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Wykryto inną sesję WPS. Spróbuj ponownie za kilka minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identyfikator SSID sieci"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Wpisz identyfikator SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpieczenia"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Siła sygnału"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stan"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Zezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odrzuć"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Połącz"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Zapomnij"</string>
@@ -610,14 +632,14 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"Anuluj"</string>
     <string name="wifi_skip_anyway" msgid="6965361454438011190">"Pomiń mimo to"</string>
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nie pomijaj"</string>
-    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja tabletu może wymagać częstego korzystania z sieci."</string>
-    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja telefonu może wymagać częstego korzystania z sieci."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"OSTRZEŻENIE: tablet nie będzie mógł sprawdzić, czy oprogramowanie jest aktualne."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"OSTRZEŻENIE: telefon nie będzie mógł sprawdzić, czy oprogramowanie jest aktualne."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Zaawansowane opcje Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Pasmo częstotliwości sieci Wi-Fi"</string>
+    <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja tabletu może wymagać przesłania dużej ilości informacji."</string>
+    <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OSTRZEŻENIE: operator może naliczyć dodatkowe opłaty za transmisję danych."\n\n"Konfiguracja telefonu może wymagać przesłania dużej ilości informacji."</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"OSTRZEŻENIE: aby sprawdzić, czy oprogramowanie jest aktualne, tablet musi mieć połączenie z internetem."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"OSTRZEŻENIE: aby sprawdzić, czy oprogramowanie jest aktualne, telefon musi mieć połączenie z internetem."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon nie może nawiązać połączenia z tą siecią Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Zaawansowane ustawienia Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Pasmo częstotliwości Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Określ używany zakres częstotliwości"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Wystąpił problem podczas ustawiania częstotliwości."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adres MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brama"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Długość przedrostka sieci"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informacje o urządzeniu"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamiętaj to połączenie"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Szukaj urządzeń"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulować zaproszenie?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Czy chcesz anulować zaproszenie do połączenia z <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Zapomnieć o tej grupie?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Przenośny hotspot Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Włączanie punktu dostępu…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Wyłączanie punktu dostępu…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Przenośny punkt dostępu <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywny"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Błąd przenośnego punktu dostępu Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Skonfiguruj hotspot Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Przenośny punkt 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_failed_subtext" msgid="1484941858530919002">"Błąd przenośnego hotspotu Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Skonfiguruj hotspot Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Siła sygnału"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Sieć"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adres MAC karty Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adres MAC karty Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adres Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Numer seryjny"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Niedostępny"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN włączona"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN wyłączona"</string>
     <string name="bearer" msgid="594270280031923558">"Nośnik"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Wartość MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Usuń APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nowy APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Zapisz"</string>
@@ -927,7 +951,7 @@
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Aby potwierdzić zamiar wyczyszczenia nośnika USB, musisz narysować wzór odblokowania."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Aby potwierdzić zamiar wyczyszczenia karty SD, musisz narysować wzór odblokowania."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Ustawienia połączeń"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekazywanie połączeń, poł. oczekujące, ID rozmówcy"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"Poczta głosowa, przekierowanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Tethering przez USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Przenośny punkt dostępu"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Tethering przez Bluetooth"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Sieci komórkowe"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokalizacja"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi i sieć komórkowa"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Przez Wi-Fi i sieć komórkową"</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="7457348712272184793">"Lokalizacja określona na podstawie sieci Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Lokalizacja określona na podstawie Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Zezwalaj aplikacjom na określanie mojej lokalizacji przez GPS tabletu"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Zezwalaj aplikacjom na określanie mojej lokalizacji przez GPS telefonu"</string>
@@ -1058,7 +1082,7 @@
     <string name="uninstall_text" msgid="3644892466144802466">"Odinstaluj"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Odinstaluj dla wszystkich użytkowników"</string>
     <string name="install_text" msgid="884360662922471113">"Zainstaluj"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Dezaktywuj"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Wyłącz"</string>
     <string name="enable_text" msgid="9217362512327828987">"Włącz"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Wyczyść dane"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Odinstaluj aktualizacje"</string>
@@ -1076,12 +1100,13 @@
     <string name="show_background_processes" msgid="2009840211972293429">"Pokaż procesy z pamięci podręcznej"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Resetuj opcje aplikacji"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Zresetować opcje aplikacji?"</string>
-    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Wszystkie te ustawienia zostaną zresetowane:"\n\n" "<li>"wyłączone aplikacje,"</li>\n" "<li>"wyłączone powiadomienia aplikacji,"</li>\n" "<li>"aplikacje używane domyślnie do wykonania czynności,"</li>\n" "<li>"ograniczenia użycia danych w tle w aplikacjach."</li>\n\n" Nie utracisz żadnych danych aplikacji."</string>
+    <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Zresetowane będą wszystkie ustawienia:"\n\n" "<li>"Wyłączone aplikacje"</li>\n" "<li>"Wyłączone powiadomienia aplikacji"</li>\n" "<li>"Aplikacje domyślne"</li>\n" "<li>"Ograniczenia użycia danych w tle dla aplikacji."</li>\n\n" Nie utracisz żadnych danych."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Resetuj aplikacje"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Zarządzaj rozmiarem"</string>
     <string name="filter" msgid="2018011724373033887">"Filtr"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Wybierz opcje filtru"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Wszystkie"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Wyłączone"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Pobrane"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Pracują"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Nośnik USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Jeśli wyłączysz wbudowaną aplikację, pozostałe programy mogą działać nieprawidłowo. Zostaną też usunięte Twoje dane."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Wyłączyć powiadomienia?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Jeśli wyłączysz powiadomienia tej aplikacji, możesz przeoczyć ważne alerty i aktualizacje."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Działania aplikacji"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Trwa"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nieużywana)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Użycie pamięci"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Wyświetl pamięć używaną przez aplikacje"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Słowo:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Skrót:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Język:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Wpisz słowo"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Opcjonalny skrót"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edytuj słowo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edytuj"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Usuń"</string>
@@ -1260,20 +1290,23 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Ustawienia klawiatury fizycznej"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opcje programistyczne"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Ustaw opcje związane z programowaniem aplikacji."</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Opcje programisty są niedostępne dla tego użytkownika"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugowanie USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Tryb debugowania, gdy podłączone jest USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Odwołaj autoryzacje do debugowania USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Błędy w menu zasilania"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Dodaj w menu zasilania opcję zgłaszania błędów"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"Zostaw włączony"</string>
+    <string name="keep_screen_on" msgid="1146389631208760344">"Pozostaw ekran włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Zezwolić na ustawienia programistyczne?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Te ustawienia są przeznaczone wyłącznie dla programistów. Ich użycie może spowodować uszkodzenie lub nieprawidłowe działanie urządzenia i zainstalowanych na nim aplikacji."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Zweryfikuj aplikacje przez USB"</string>
-    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Sprawdź, czy aplikacje zainstalowane przez ADB/ADT nie zachowują się w szkodliwy sposób."</string>
+    <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Sprawdź, czy aplikacje zainstalowane przez ADB/ADT nie zachowują się w szkodliwy sposób"</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"Chroń nośnik USB"</string>
     <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"Aplikacje muszą prosić o pozwolenie na odczyt nośnika USB"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"Włączyć ochronę nośnika USB?"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Powiększenie ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Automatyczna aktualizacja powiększenia ekranu"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Aktualizuj powiększenie ekranu przy zmianie aplikacji"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Przycisk zasilania kończy połączenie"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Przycisk zasilania rozłącza"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Wypowiadaj hasła na głos"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Czas dotknięcia i przytrzymania"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Zwiększenie dostępności stron"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ustawienia"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Wł."</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Wył."</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dozwolone"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Niedozwolone"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Zezwalaj"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nie zezwalaj"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Użyć usługi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> może gromadzić cały wpisywany tekst z wyjątkiem haseł. Dotyczy to także danych osobistych, np. numerów kart kredytowych. Może ponadto zbierać informacje o korzystaniu z tabletu."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> może gromadzić cały wpisywany tekst z wyjątkiem haseł. Dotyczy to także danych osobistych, np. numerów kart kredytowych. Może ponadto zbierać informacje o korzystaniu z telefonu."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Zatrzymać usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Dotknięcie OK spowoduje zatrzymanie usługi <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"Użyć 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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserwowanie Twoich działań"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Otrzymywanie powiadomień podczas Twojej pracy z aplikacją."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Zatrzymać <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Dotknięcie OK spowoduje zatrzymanie usługi <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Brak zainstalowanych usług"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrzebujesz czytnika ekranu?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack odczytuje zawartość ekranu, pomagając użytkownikom niewidomym i niedowidzącym. Czy chcesz zainstalować tę usługę za darmo z Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Czy chcesz, aby aplikacje instalowały skrypty od Google, które zwiększą dostępność treści internetowych?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Brak opisu"</string>
     <string name="settings_button" msgid="3006713718908152930">"Ustawienia"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Ładowanie"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran włączony"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS włączony"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktywność"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sygnał sieci komórkowej"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi na czas"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi na czas"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Czas z włączonym Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Czas z wł. Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historia – szczegóły"</string>
     <string name="details_title" msgid="3792801565213935385">"Szczegóły użycia"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Dostosuj wykorzystanie energii"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Dołączone pakiety"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Tryb gotowości"</string>
     <string name="power_phone" msgid="5392641106474567277">"Połączenia głosowe"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU (pierwszy plan)"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Utrzymanie aktywności"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Działanie Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Praca Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dane wysłane"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informacje o aplikacji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Ustawienia aplikacji"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ustawienia ekranu"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Ustawienia Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Ustawienia Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Ustawienia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Użycie baterii przez połączenia głosowe"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Użycie baterii przy nieaktywnym tablecie"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Przełącz w tryb samolotowy na obszarach bez zasięgu sieci komórkowych, aby oszczędzać energię"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Użycie baterii przez wyświetlacz i podświetlenie"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Zmniejsz jasność ekranu i/lub czas jego wygaszania"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Użycie baterii przez Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Wyłącz Wi-Fi, gdy sieć nie jest używana lub jest niedostępna."</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Użycie baterii przez Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Wyłącz Wi-Fi, gdy sieć nie jest używana lub jest niedostępna"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Użycie baterii przez Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Wyłącz moduł Bluetooth, gdy nie jest używany."</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Spróbuj połączyć się z innym urządzeniem Bluetooth."</string>
@@ -1431,13 +1459,14 @@
     <string name="tts_play_example_title" msgid="7094780383253097230">"Posłuchaj przykładu"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Odtwórz krótką prezentację syntezy mowy"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Zainstaluj dane głosowe"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Zainstaluj dane głosowe wymagane dla syntezy mowy"</string>
-    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Dane głosowe wymagane dla syntezy mowy zostały już poprawnie zainstalowane"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Zainstaluj dane głosowe wymagane do syntezy mowy"</string>
+    <string name="tts_data_installed_summary" msgid="9162111552859972809">"Dane głosowe wymagane do syntezy mowy zostały już poprawnie zainstalowane"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Ustawienia zostały zmienione. Oto przykład aktualnie skonfigurowanego brzmienia."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"Nie można uruchomić wybranego mechanizmu."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguruj"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Wybierz inny mechanizm"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ten mechanizm syntezy mowy może gromadzić cały odczytywany tekst, w tym dane osobiste w postaci haseł i numerów kart kredytowych. Nazwa mechanizmu to <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Włączyć ten mechanizm syntezy mowy?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Do przetwarzania tekstu na mowę w tym języku wymagane jest działające połączenie sieciowe."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mechanizmy"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Ustawienia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mechanizm <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> jest włączony"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferowany mechanizm"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Ogólne"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Zarządzanie energią"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Aktualizowanie ustawień Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Aktualizowanie ustawień Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Aktualizowanie ustawień Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"wł."</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"wył."</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"włączanie"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"wyłączanie"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizacja"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Usuń wszystkie certyfikaty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Zaufane dane uwierzytelniające"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wyświetlanie zaufanych certyfikatów CA"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Typ pamięci"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Wspomagana sprzętowo"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Tylko programowa"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narysuj wzór odblokowania"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,19 +1534,19 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Tworzenie i przywracanie kopii zapasowej"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dane osobiste"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Utwórz kopię zapasową"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Zapisuj na serwerach Google kopie zapasowe danych aplikacji, haseł sieci Wi-Fi i innych ustawień."</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="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="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_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>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nowe hasło kopii zapasowej zostało ustawione"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nowe hasło i jego potwierdzenie nie zgadzają się"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Ustawienie hasła kopii zapasowej nie powiodło się"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Zatrzymać tworzenie kopii zapasowych haseł sieci Wi-Fi, zakładek, innych ustawień oraz danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Zatrzymać tworzenie kopii zapasowych haseł Wi-Fi, zakładek, innych ustawień i danych aplikacji, a także usunąć wszystkie kopie z serwerów Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Ustawienia administracji"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator urządzenia"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Dezaktywuj"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Powiadomienia"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Dzwonek i wibracje przy połączeniu"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Konfiguracja sieci Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Połącz z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Łączenie z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Konfiguracja Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Połącz z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Łączę z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodaj sieć"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nie połączono"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj sieć"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Łączenie…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Przejdź do następnego etapu."</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Protokół EAP nie jest obsługiwany."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Ustawień połączenia Wi-Fi z zabezpieczeniami EAP nie można określić podczas konfiguracji. Możesz to zrobić później na ekranie Ustawienia &gt; Sieci bezprzewodowe."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Ustawień połączenia Wi-Fi z zabezpieczeniami EAP nie można określić podczas konfiguracji. Możesz to zrobić później na ekranie Ustawienia &gt; Sieci bezprzewodowe."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Łączenie może potrwać kilka minut…"</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Dotknij opcji "<b>"Dalej"</b>", aby kontynuować konfigurację."\n\n"Wybierz "<b>"Wróć"</b>", aby połączyć się z inną siecią Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kliknij "<b>"Dalej"</b>", by kontynuować konfigurację."\n\n"Kliknij "<b>"Wróć"</b>", by połączyć się z inną siecią Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizacja włączona"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizacja wyłączona"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Błąd synchronizacji"</string>
@@ -1570,7 +1602,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Aplikacje zawsze mogą synchronizować, wysyłać i odbierać dane."</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Wyłączyć dane w tle?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Wyłączenie obsługi danych w tle wydłuża czas pracy baterii i ogranicza transmisję danych. Niektóre aplikacje mogą nadal używać połączenia transmisji danych w tle."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Autosynch. dane aplikacji"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Synchronizuj dane"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Synchronizacja włączona"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Synchronizacja jest wyłączona"</string>
     <string name="sync_error" msgid="5060969083117872149">"Błąd synchronizacji"</string>
@@ -1622,9 +1654,10 @@
     <string name="select_application" msgid="5156029161289091703">"Wybierz aplikację"</string>
     <string name="no_application" msgid="2813387563129153880">"Brak"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"Poczekaj na debugera"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacja do debugowania czeka na przyłączenie debugera."</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplikacja do debugowania czeka na przyłączenie debugera"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Ekran dotykowy"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Rysowanie"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Sprzętowa akceleracja renderowania"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorowanie"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Tryb ścisły włączony"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Miganie ekranu podczas długich operacji w wątku głównym"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Najlepszy-najg.: nieb., ziel., jasnoczerw., czerw."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Włącz ślady"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Wybierz włączone ślady"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Brak włączonych śladów"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Włączone ślady: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Wszystkie ślady są włączone"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Włącz śledzenia OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Pokaż granice układu"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaż granice przycięcia, marginesy itd."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Wymuszaj użycie GPU do rysowania 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Wymuś 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Włącz 4x MSAA w aplikacjach OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Debuguj operacje przycinania nieprostokątnego"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil renderowania GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mierz czas renderowania w adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala animacji okna"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesów w tle"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Pokaż wszystkie ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Pokaż okno Aplikacja Nie Reaguje dla aplikacji w tle"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Użyj eksperymentalnej aplikacji WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikacje będą korzystać z najnowszej wersji (beta) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Użycie danych"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cykl transmisji danych"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dane w roamingu"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ogranicz przesył danych w tle"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming danych"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ogranicz dane w tle"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Oddzielnie transmisja danych 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Pokaż użycie Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Pokaż wykorzystanie Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Pokaż użycie sieci Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Hotspoty komórkowe"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Autosynchronizacja danych"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Limit danych mobilnych"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Ustaw limit trans. danych 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Ustaw limit trans. danych 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Ustaw limit trans. danych Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ustaw limit trans. danych Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilne"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez tablet i operatora, więc warto ustawić nieco niższy limit."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Komórkowe połączenie transmisji danych zostanie wyłączone po wyczerpaniu limitu."\n\n"Ilość przesyłanych danych może być różnie rozliczana przez telefon i operatora, więc warto ustawić nieco niższy limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ograniczyć dane w tle?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Jeśli ograniczysz transmisję danych w tle, niektóre aplikacje i usługi będą działać tylko po nawiązaniu połączenia z siecią Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały wyłącznie po połączeniu z siecią Wi-Fi."\n\n"To ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały wyłącznie po połączeniu z siecią Wi-Fi."\n\n"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi."\n\n"Ustawienie dotyczy wszystkich użytkowników tego tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Jeśli ograniczysz komórkową transmisję danych w tle, niektóre aplikacje i usługi będą działały tylko po połączeniu z siecią Wi-Fi."\n\n"Ustawienie dotyczy wszystkich użytkowników tego telefonu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ostrzeżenie"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Usunięte aplikacje"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: wykorzystane <xliff:g id="TOTAL">%1$s</xliff:g> wg licznika w tablecie. Rozliczenie operatora może się różnić."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: wykorzystane <xliff:g id="TOTAL">%1$s</xliff:g> wg licznika w telefonie. Rozliczenie operatora może się różnić."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspoty komórkowe"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Wybierz sieci Wi-Fi, które są hotspotami komórkowymi. Możesz ograniczyć aplikacjom działającym w tle dostęp do tych sieci. Aplikacje mogą też ostrzegać, zanim użyją tych sieci do pobrania dużych ilości danych."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Wybierz sieci Wi-Fi, które są hotspotami komórkowymi. Możesz ograniczyć dostęp do tych sieci aplikacjom działającym w tle. Aplikacje mogą też ostrzegać, zanim użyją tych sieci do pobrania dużych ilości danych."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Sieci komórkowe"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Sieci Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Aby wybrać hotspoty komórkowe, włącz Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Sieci Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Aby wybrać hotspoty komórkowe, włącz Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Połączenie alarmowe"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Powrót do połączenia"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nazwa"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Pobłażliwy"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Restrykcyjny"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Użytkownicy"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Ty"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Inni użytkownicy"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj użytkownika"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktywny"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Nieaktywny"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Użytkownicy i profile"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Dodaj użytkownika lub profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil ograniczony"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Zanim utworzysz profil z ograniczeniami, musisz skonfigurować ekran blokady, by chronić aplikacje i osobiste dane."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Ustaw blokadę"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nieskonfigurowany"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nieskonfigurowany profil ograniczony"</string>
     <string name="user_owner" msgid="3879126011135546571">"Właściciel"</string>
+    <string name="user_you" msgid="1639158809315025986">"Ty (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Dodaj"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Użytkownicy mają własne aplikacje i treści"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Możesz ograniczyć dostęp do aplikacji i zawartości z poziomu swojego konta"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Użytkownik"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil ograniczony"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj nowego użytkownika"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Możesz użytkować to urządzenie wspólnie z innymi osobami, tworząc dodatkowych użytkowników. Każdy użytkownik ma swoje własne miejsce, które może spersonalizować własnymi aplikacjami, tapetą itd. Użytkownicy mogą także zmieniać ustawienia tabletu, które dotyczą wszystkich, np. Wi-Fi."\n\n"Po utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji."\n\n"Każdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Możesz korzystać z tego urządzenia wspólnie z innymi osobami, tworząc dodatkowych użytkowników. Każdy użytkownik ma swoje własne miejsce, które może spersonalizować własnymi aplikacjami, tapetą itd. Użytkownicy mogą także zmieniać ustawienia tabletu, które dotyczą wszystkich, np. Wi-Fi."\n\n"Po utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji."\n\n"Każdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Po utworzeniu nowego użytkownika musi on przejść przez proces konfiguracji."\n\n"Każdy użytkownik może akceptować zaktualizowane uprawnienia aplikacji w imieniu wszystkich pozostałych użytkowników."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Skonfigurować ustawienia dla użytkownika?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Upewnij się, że ta osoba jest w pobliżu i może skonfigurować swój profil na tablecie"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Skonfigurować teraz profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Skonfiguruj teraz"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nie teraz"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Użytkownikami może zarządzać tylko właściciel tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Użytkownikami może zarządzać tylko właściciel telefonu."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profile z ograniczeniami nie mogą dodawać kont"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Usuń użytkownika <xliff:g id="USER_NAME">%1$s</xliff:g> z tego urządzenia"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nowy użytkownik"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nowy profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcesz usunąć siebie?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Usunąć użytkownika?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Usunąć profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Utracisz swój obszar i dane na tym tablecie. Tej czynności nie można cofnąć."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Utracisz swój obszar i dane na tym telefonie. Tej czynności nie można cofnąć."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Obszar i dane tego użytkownika znikną z tabletu. Tej czynności nie można cofnąć."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Obszar i dane tego użytkownika znikną z telefonu. Tej czynności nie można cofnąć."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Obszar i dane tego profilu znikną z tabletu. Tej czynności nie można cofnąć."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Obszar i dane tego profilu znikną z telefonu. Tej czynności nie można cofnąć."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Dodaję nowego użytkownika…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Usuń użytkownika"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Usuń"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"To ustawienie obowiązuje wszystkich użytkowników tego tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"To ustawienie obowiązuje wszystkich użytkowników tego telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmień język"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisje komórkowe"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wybierz typy alertów o zagrożeniu, które chcesz wyświetlić."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Ograniczenia aplikacji i zawartości"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ZMIEŃ NAZWĘ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Zezwalaj na modyfikowanie parowań i ustawień Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"Komunikacja NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Zezwalaj na wymianę danych, gdy tablet dotyka innego urządzenia"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Zezwalaj na wymianę danych, gdy telefon dotyka innego urządzenia"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Dostęp do lokalizacji"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Zezwalaj aplikacji na korzystanie z informacji o lokalizacji"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Wróć"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Dalej"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Zakończ"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Zrób zdjęcie"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Wybierz zdjęcie z galerii"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 7d82635..267fe34 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Lenta"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="2538100882620724753">"Muito rápida"</item>
+    <item msgid="1370673569131070146">"Mais Rápida"</item>
+    <item msgid="4648206845228970803">"Muito rápida"</item>
+    <item msgid="4977949754169483251">"Rápida"</item>
+    <item msgid="6106302964845503577">"Muito rápida"</item>
+    <item msgid="6800277205640837264">"A Mais Rápida"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muito baixa"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nenhum"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Não especificado"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Nenhum"</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">"Armazenamento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD amovível"</item>
     <item msgid="4498124044785815005">"Permitir que seja o sistema a decidir"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Local"</item>
+    <item msgid="255608127647030286">"Pessoal"</item>
+    <item msgid="4588829735729884491">"Mensagens"</item>
+    <item msgid="8971765125227378270">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"localização aproximada"</item>
+    <item msgid="5789673140227507995">"localização exata"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrar"</item>
+    <item msgid="3434165993711230924">"ler contactos"</item>
+    <item msgid="616161687718081936">"modificar os contactos"</item>
+    <item msgid="7638002295329050091">"ler o registo de chamadas"</item>
+    <item msgid="6546959730920410907">"modificar o registo de chamadas"</item>
+    <item msgid="446877710771379667">"ler calendário"</item>
+    <item msgid="7674458294386319722">"modificar o calendário"</item>
+    <item msgid="8281201165558093009">"procura de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificação"</item>
+    <item msgid="7776439107987345446">"procura celular"</item>
+    <item msgid="514615766544675057">"ligar para telefone"</item>
+    <item msgid="8181415497109310680">"ler SMS"</item>
+    <item msgid="6816551144382117307">"escrever SMS"</item>
+    <item msgid="4600463921908905030">"receber SMS"</item>
+    <item msgid="5958926493289432745">"receber SMS de emergência"</item>
+    <item msgid="4945269495221089540">"receber MMS"</item>
+    <item msgid="5570472453573929087">"receber push WAP"</item>
+    <item msgid="7125408150230860501">"enviar SMS"</item>
+    <item msgid="7080337936612188061">"ler SMS ICC"</item>
+    <item msgid="587124103118495063">"escrever SMS ICC"</item>
+    <item msgid="2320577158869025503">"modificar as definições"</item>
+    <item msgid="1545733463471924009">"desenhe na parte superior"</item>
+    <item msgid="3609046903962454582">"aceder às notificações"</item>
+    <item msgid="4671646036128214513">"câmara"</item>
+    <item msgid="1097324338692486211">"gravar áudio"</item>
+    <item msgid="5031552983987798163">"reproduzir áudio"</item>
+    <item msgid="8374996688066472414">"ler área de transferência"</item>
+    <item msgid="3045529469061083747">"modificar área de transferência"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Localização"</item>
+    <item msgid="8677040780775113033">"Localização"</item>
+    <item msgid="1660743989948992916">"Localização"</item>
+    <item msgid="8791172739860195290">"Vibrar"</item>
+    <item msgid="383413555642128046">"Ler contactos"</item>
+    <item msgid="3654594895269697313">"Modificar os contactos"</item>
+    <item msgid="7928393476362362538">"Ler registo de chamadas"</item>
+    <item msgid="6248591205254641116">"Modificar o registo de chamadas"</item>
+    <item msgid="6093344633066170692">"Ler calendário"</item>
+    <item msgid="1334886368750347692">"Modificar o calendário"</item>
+    <item msgid="1638204101698708656">"Localização"</item>
+    <item msgid="2154671955760380322">"Publicar notificação"</item>
+    <item msgid="4282477730595931828">"Localização"</item>
+    <item msgid="4891423912898525905">"Ligar para telefone"</item>
+    <item msgid="626463821668200388">"Receber SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Enviar SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Receber SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Receber SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Receber SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Receber SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Receber SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Enviar SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modificar as definições"</item>
+    <item msgid="736541391767350377">"Desenhe na parte superior"</item>
+    <item msgid="5530815681721654194">"Aceder às notificações"</item>
+    <item msgid="781213371706962767">"Câmara"</item>
+    <item msgid="1720492593061838172">"Gravar áudio"</item>
+    <item msgid="3493046322001257041">"Reproduzir áudio"</item>
+    <item msgid="136815868796597058">"Ler área de transferência"</item>
+    <item msgid="5238692940326972503">"Modificar área de transferência"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curta"</item>
     <item msgid="2560532955514699713">"Média"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Gráficos)"</item>
     <item msgid="1340692776955662664">"Pilha de chamadas em glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Desativado"</item>
+    <item msgid="675719912558941285">"Desenhar região de clipe não retangular a azul"</item>
+    <item msgid="1064373276095698656">"Realçar comandos de desenho testados a verde"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Desativado"</item>
+    <item msgid="2751513398307949636">"No ecrã como barras"</item>
+    <item msgid="8272260411216018353">"No ecrã como linhas"</item>
+    <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 18a49b1..3a2a93b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de voo"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fios e outras"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Ligar a serviços de dados em roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Ligar a serviços de dados em roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduzir texto a apresentar no ecrã de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar info. utilizador no ecrã de bloqueio"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. utilizador"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar informação do perfil no ecrã de bloqueio"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acesso à localização"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
     <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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradores do dispositivo"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver ou desativar administradores do dispositivo"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Acesso a notificações"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não conseguem 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>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum serviço de escuta 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Memorizar definições"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Visualização sem fios"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver os dispositivos, ative a visualização sem fios."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"A visualização sem fios está desativada porque o Wi-Fi está desligado."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"A visualização sem fios está desativada porque o Wi-Fi está desligado."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Pesquisar ecrãs"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"A pesquisar..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Não foram encont. ecrãs sem fios próx."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Quando esta funcionalidade está ativada, pode transmitir o conteúdo da aplicação para outro aparelho com capacidade de NFC mantendo os aparelhos próximos um do outro. Por exemplo, pode transmitir páginas do Navegador, vídeos do YouTube, contactos de Pessoas e muito mais. "\n\n"Basta juntar os aparelhos (normalmente de costas) e, em seguida, tocar no ecrã. A aplicação determina o que é transmitido."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Deteção do serviço de rede"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que aplicações noutros dispositivos detetem aplicações neste dispositivo"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Definições de Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Definições de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerir pontos de acesso sem fios"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Selecionar Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"A ligar Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"A desligar Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecionar Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"A ligar Wi-Fi..."</string>
+    <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="3038290727701553612">"Notificar-me quando estiver disponível uma rede aberta"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar más ligações"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Não utilizar uma rede Wi-Fi a menos que tenha uma boa ligação à Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Manter Wi-Fi ligada durante suspensão"</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_scan_always_available" msgid="3470564139944368030">"Procura de redes sempre disponível"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permitir que o serviço de localização da Google e outras aplicações procurem redes, mesmo quando a ligação Wi-Fi está desativada"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para melhorar a precisão de localização e para outros fins, a Google e outras aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura de redes sempre disponível."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"As aplicações poderão procurar redes nas proximidades, mesmo com o Wi-Fi desligado. Se não pretender que isto aconteça, aceda a Avançadas &gt; Procura sempre disponível."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar de novo"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi ligada durante suspensão"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema ao alterar a definição"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Otimização de Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar a utilização da bateria quando o Wi-Fi está ligado"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Otimização de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar a utilização da bateria quando o Wi-Fi está ligado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Mais opções"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introdução PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver as redes disponíveis, ligue o Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"A pesquisar redes Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver as redes disponíveis, ligue o Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"A pesquisar redes Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Não tem autorização para alterar a rede Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Para concluir a configuração, o tablet necessita de acesso à rede Wi-Fi. Após a configuração, poderá alternar entre dados móveis e Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Para concluir a configuração, o tablet necessita de acesso à rede Wi-Fi. Após a configuração, poderá alternar entre dados móveis e Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuração Wi-Fi Protegida"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"Introduza o PIN <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_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_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="5754399645462924103">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"O WPS já está em curso e pode demorar até dois minutos a concluir"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"O WPS falhou. Tente novamente dentro de alguns minutos."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A definição de segurança do router sem fios (WEP) não é suportada"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Foi detetada outra sessão do WPS. Tente novamente dentro de alguns minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduza o SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensidade do sinal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Estado"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Permitir esta opção para todas as aplicações que pretenderem verificar?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Recusar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Ligar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Não ignorar"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVISO: poderão ser cobradas taxas de dados adicionais pelo operador."\n\n"A configuração do tablet poderá necessitar de uma atividade de rede considerável."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: poderão ser cobradas taxas de dados adicionais pelo operador."\n\n"A configuração do telemóvel poderá necessitar de uma atividade de rede considerável."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVISO: o tablet não conseguirá confirmar se o seu software está atualizado."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVISO: o telemóvel não conseguirá confirmar se o seu software está atualizado."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"O tablet não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"O telemóvel não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi Avançada"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frequência Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVISO: se não tiver uma ligação à Internet, não será possível verificar se o software do tablet está atualizado."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVISO: se não tiver uma ligação à Internet, não será possível verificar se o software do telemóvel está atualizado."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telemóvel não conseguiu estabelecer ligação a esta rede Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi Avançada"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda de frequência Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifique o intervalo de frequência de operação"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Problema ao definir a banda de frequência."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Compr. do prefixo de rede"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informações do aparelho"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Memorizar esta ligação"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Pesquisar aparelhos"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Pretende cancelar o convite para se ligar a <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Zona Wi-Fi portátil"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"A ativar zona Wi-Fi..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"A desativar zona Wi-Fi..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activo"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro do hotspot Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar zona Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Hotspot 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_failed_subtext" msgid="1484941858530919002">"Erro da zona Wi-Fi portátil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensidade do sinal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Rede"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Endereço MAC de Wi-Fi:"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC de Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponível"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ativado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN desativado"</string>
     <string name="bearer" msgid="594270280031923558">"Portador"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo de MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor da MVNO (Operadora Móvel com Rede Virtual)"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Eliminar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Guardar"</string>
@@ -932,7 +956,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ligação Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ligação ponto a ponto"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ligação e hotspot port."</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Partilha de Internet"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Associação USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Ligado via USB; confirme para associar"</string>
@@ -955,19 +979,19 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="location_title" msgid="1029961368397484576">"A minha localização"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi e localização de rede móvel"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Permita que aplic. usem o serv. localiz. Google para calcular mais rapidamente a sua local. Rec. dados anónimos e env. à Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Localização determinada por Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi e localização de rede de telemó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>
     <string name="location_gps" msgid="8392461023569708478">"Satélites GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permita que as aplicações utilizem o GPS do tablet para localizar a sua posição"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permita que as aplicações utilizem o GPS do telemóvel para localizar a sua posição"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que as aplicações utilizem o GPS do tablet para localizar a sua posição"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Permitir que as aplicações utilizem o GPS do telemóvel p/ determinar a sua posição"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS assistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para reduzir a utilização da rede)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Utilizar o servidor para auxiliar o GPS (desmarque esta opção para melhorar o desempenho do GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Localização e pesquisa do Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permitir que o Google utilize a sua localização para melhorar os resultados da pesquisa e os outros serviços"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acesso à minha localização"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permita que as aplicações que tenham solicitado a sua permissão utilizem informações sobre a sua localização"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Acesso à localização"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permitir que aplic. com permissão utilizem informações sobre a sua localização"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Origens da localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Acerca do tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Acerca do telefone"</string>
@@ -1058,7 +1082,7 @@
     <string name="uninstall_text" msgid="3644892466144802466">"Desinstalar"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Desinstalar para todos os utilizadores"</string>
     <string name="install_text" msgid="884360662922471113">"Instalar"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Desactivar"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Desativar"</string>
     <string name="enable_text" msgid="9217362512327828987">"Ativar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Limpar dados"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar actualizações"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtrar"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Escolher opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todas"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desativadas"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Transferidas"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Em execução"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Se desativar uma aplicação integrada, outras aplicações podem funcionar incorretamente. Os seus dados também serão eliminados."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se desativar as notificações para esta aplicação, pode perder alertas e atualizações importantes."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Utilizações da aplicação"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca utilizado)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilização do armazenam."</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ver armazenamento utilizado pelas aplicações"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palavra:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Atalho:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Escreva uma palavra"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Atalho opcional"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palavra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Eliminar"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Definições do teclado físico"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opções de programador"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Definir opções de desenvolvimento da aplicação"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"As opções de programador não estão disponíveis para este utilizador"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração com USB ligado"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Relatórios de erros do menu avançado"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opção no menu avançado para criar um relatório de erros"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Manter ativo"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permitir definições de programação?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Estas definições destinam-se apenas a programação. Podem fazer com que o seu aparelho e as aplicações nele existentes falhem ou funcionem mal."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificar aplicações de USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Ampliação do ecrã"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Atualiz. auto da ampliação do ecrã"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Atualizar ampliação do ecrã em transições de aplic"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão ligar/deslig. termina chamada"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão ligar/deslig. fim chamada"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Dizer palavras-passe"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Atraso ao manter premida a tecla"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Melhorar a acessibilidade da Web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"permitido"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Não permitido"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Não permitir"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Utilizar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"O <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pode recolher todo o texto que escrever, exceto palavras-passe. Isto inclui dados pessoais, como números de cartão de crédito. Também pode recolher dados sobre as suas interações com o tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"O <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pode recolher todo o texto que escrever, exceto palavras-passe. Isto inclui dados pessoais, como números de cartão de crédito. Pode também recolher dados sobre as suas interações com o telemóvel."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Ao tocar em OK, o <xliff:g id="SERVICE">%1$s</xliff:g> será desativado."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar as suas ações"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Receber notificações quando estiver a interagir com uma aplicação."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Tocar em OK irá parar <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço instalado"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Necessita de um leitor de ecrã?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece respostas faladas para ajudar os utilizadores invisuais e com deficiência visual. Pretende instalá-lo gratuitamente a partir do Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Pretende que as aplicações instalem scripts do Google que tornam o respetivo conteúdo Web mais acessível?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Definições"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
@@ -1343,15 +1371,15 @@
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> desde que foi desligado"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"A carregar"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ecrã activo"</string>
-    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ativado"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Despertar"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinal da rede móvel"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Hora de activação do dispositivo"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo de ligação Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo de ligação Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ligação Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ligação Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Utilizar detalhes"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar utilização de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ecrã"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"inactividade do telefone"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Primeiro plano da CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Manter desperto"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi em execução"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi em execução"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informações da aplicação"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Definições da aplicação"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Definições do ecrã"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Definições de Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Definições de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Definições de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria utilizada por chamadas de voz"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria utilizada quando o tablet está inactivo"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Mudar para modo de avião para poupar energia em áreas sem cobertura de rede"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria utilizada pelo ecrã e pela iluminação de fundo"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduzir o brilho do ecrã e/ou o tempo que este permanece iluminado"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateria utilizada por Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Desativar Wi-Fi quando não estiver a ser utilizada ou não estiver disponível"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Bateria utilizada por Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Desativar Wi-Fi quando não estiver a ser utilizada ou não estiver disponível"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bateria utilizada pelo Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Desligar o Bluetooth quando não estiver a ser utilizado"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Tentar ligação a um aparelho Bluetooth diferente"</string>
@@ -1438,9 +1466,10 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Escolher outro motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este motor de síntese de discurso pode permitir a recolha de todo o texto que será falado, incluindo dados pessoais, como palavras-passe e números de cartão de crédito. O serviço é fornecido com o motor <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permitir a utilização deste motor de síntese de discurso?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma ligação de rede ativa para uma saída de síntese de voz."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motores"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Definições de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
-    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está activado"</string>
+    <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está ativado"</string>
     <string name="tts_engine_name_is_disabled_summary" msgid="7644198182255168200">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> está desactivado"</string>
     <string name="tts_engine_settings_section" msgid="2346105138448751893">"Definições do motor"</string>
     <string name="tts_engine_settings_title" msgid="3499112142425680334">"Definições do <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferido"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Geral"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controlo de energia"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Atualizar definição de Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"A atualizar definição de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizar a definição do Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"a ligar"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"a desligar"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizar"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de armazenamento"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Apenas software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1493,7 +1525,7 @@
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Palavra-passe incorrecta. Tem mais <xliff:g id="NUMBER">%1$d</xliff:g> tentativas antes de o armazenamento de credenciais ser apagado."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Armaz. credenciais apagado."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Não foi possível apagar o armazenamento de credenciais."</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está activado."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está ativado."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder utilizar o armazenamento de credenciais, é necessário definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Fazer cópia de segurança e restaurar"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer uma cópia de segurança dos meus dados"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Fazer cópia de segurança dos dados da aplicação, palavras-passe de Wi-Fi e outras definições para os servidores da Google"</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="auto_restore_title" msgid="5397528966329126506">"Restauro automático"</string>
@@ -1514,10 +1546,10 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"A nova palavra-passe e a confirmação não coincidem"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Falha na definição da palavra-passe da cópia de segurança"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Deixar de fazer cópia de segurança de palavras-passe de Wi-Fi, marcadores, outras definições e dados da aplicação, bem como apagar todas as cópias nos servidores da Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Deixar de fazer cópia de segurança de palavras-passe de Wi-Fi, marcadores, outras definições e dados da aplicação, bem como apagar todas as cópias nos servidores da Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Definições de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Desactivar"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Administradores do dispositivo"</string>
     <string name="no_device_admins" msgid="702695100241728775">"Não existem administradores do dispositivo disponíveis"</string>
     <string name="add_device_admin_msg" msgid="6246742476064507965">"Ativar administrador do dispositivo?"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificações"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Toque e vibração das chamadas"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configuração Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"A ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configuração Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"A ligar à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adicionar uma rede"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não ligada"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"A ligar..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Avançar para o passo seguinte"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP não suportado."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Não é possível configurar uma ligação Wi-Fi tipo EAP durante a configuração. Após a configuração, é possível fazê-lo em Definições &gt; Redes sem fios e outras."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Não é possível configurar uma ligação Wi-Fi tipo EAP durante a configuração. Após a configuração, é possível fazê-lo em Definições &gt; Redes sem fios e outras."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"A ligação pode demorar alguns minutos..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Seguinte"</b>" para continuar a configuração."\n\n"Toque em "<b>"Anterior"</b>" para ligar a uma rede Wi-Fi diferente."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Seguinte"</b>" para continuar a configuração."\n\n"Toque em "<b>"Anterior"</b>" para ligar a uma rede Wi‑Fi diferente."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização"</string>
@@ -1625,15 +1657,16 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"A aplicação depurada aguarda a anexação do depurador antes da execução"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Introdução"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Desenho"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Conversão acelerada de hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorização"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modo rigoroso ativado"</string>
-    <string name="strict_mode_summary" msgid="142834318897332338">"Piscar ecrã qd aplic. fazem oper. prolong. no tópico princ."</string>
+    <string name="strict_mode_summary" msgid="142834318897332338">"Piscar ecrã se aplic. fazem oper. prolong. no tópico princ."</string>
     <string name="pointer_location" msgid="6084434787496938001">"Localização do ponteiro"</string>
-    <string name="pointer_location_summary" msgid="840819275172753713">"Sobrep. de ecrã que mostra a dados atuais de toque"</string>
+    <string name="pointer_location_summary" msgid="840819275172753713">"Apresentar dados atuais de toque"</string>
     <string name="show_touches" msgid="1356420386500834339">"Apresentar toques"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Apresentar feedback visual para toques"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Most. atualiz. superfície"</string>
-    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Destacar todas as superf. janelas quando atualizam"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Atualiz. de superfície"</string>
+    <string name="show_screen_updates_summary" msgid="2569622766672785529">"Destacar a superfície da janela ao atualizar"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Most.atualiz. visual. GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Dest. visualiz. em janelas quando desenh. c/ GPU"</string>
     <string name="show_hw_layers_updates" msgid="5645728765605699821">"Mostrar atual. cam. hard."</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Melhor para pior: azul, verde, verm. claro, verm."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Ativar rastreios"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selec. rastreios ativados"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Sem rastreios ativados atualmente"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> rastreios ativados atualmente"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos os rastreios ativados atualmente"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar vestígios OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limit. do esquema"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Apresentar limites de clipes, margens, etc."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forçar a utilização de GPU para desenho 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forçar 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Ativar o 4x MSAA em aplicações OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Depurar operações de clipe não retangulares"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Conversão GPU do perfil"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tempo de conv. em adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de anim. da janela"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite proc. em 2º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Mostrar erro \"Aplic. não Resp.\" p/ aplic. 2º plano"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Usar Vista Web Experim."</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"As aplic. utilizarão Vista Web (beta) mais recente"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Utilização de dados"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo de utiliz. de dados"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de dados"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir dados em 2º plano"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir dados 2º plano"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separar utilização de 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar utilização de Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Mostrar utiliz. de Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostrar utilização de Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Zonas Wi-Fi móveis"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronização automática de dados"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Definir limite de dados 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Definir limite de dados 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Definir limite de dados Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Definir limite de dados Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Telemóvel"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo tablet e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"A ligação móvel de dados será desativada quando for atingido o limite especificado."\n\n"Uma vez que a utilização dos dados é medida pelo telemóvel e o seu operador pode calcular a utilização de forma diferente, considere utilizar um limite de precaução."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados em segundo plano?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se restringir os dados móveis de segundo plano, algumas aplicações e serviços não funcionarão a não ser que esteja ligado a uma rede Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste telemóvel."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Se restringir os dados móveis de segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Se restringir os dados móveis em segundo plano, algumas aplicações e serviços não funcionarão exceto se estiver ligado a uma rede Wi-Fi."\n\n"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicações removidas"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s), conforme medido pelo tablet. O registo da utilização de dados do seu operador poderá ser diferente."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: cerca de <xliff:g id="TOTAL">%1$s</xliff:g> utilizado(s), conforme medido pelo telemóvel. O registo da utilização de dados do seu operador poderá ser diferente."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Zonas Wi-Fi móveis"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecione as redes Wi-Fi que são zonas Wi-Fi móveis. As aplicações podem ser impedidas de utilizar estas redes quando estiverem em segundo plano e podem notificar o utilizador antes de utilizá-las para grandes transferências."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecione as redes Wi-Fi que são zonas Wi-Fi móveis. As aplicações podem ser impedidas de utilizar estas redes quando estiverem em segundo plano e podem notificar o utilizador antes de utilizá-las para grandes transferências."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para selecionar zonas Wi-Fi móveis, ative o Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Para selecionar zonas Wi-Fi móveis, ative o Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Regressar à chamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Forçador"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizadores"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"O utilizador"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Outros utilizadores"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar utilizador"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Ativo"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Não ativo"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Utilizadores e perfis"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Adicionar utilizador ou perfil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrito"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Antes de poder criar um perfil restrito, tem de configurar um bloqueio de ecrã para proteger as suas aplicações e dados pessoais."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Definir bloqueio"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Não configurado – Perfil restrito"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
+    <string name="user_you" msgid="1639158809315025986">"Você (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudónimo"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Adicionar"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Os utilizadores têm as suas próprias aplicações e conteúdos"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Pode restringir o acesso às aplicações e conteúdos da sua conta"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizador"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo utilizador"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Pode partilhar este dispositivo com outras pessoas criando utilizadores adicionais. Cada utilizador tem o seu próprio espaço, que pode personalizar com as suas próprias aplicações, imagem de fundo, etc. Os utilizadores também podem ajustar as definições do tablet, como por exemplo o Wi-Fi, que afetam toda as pessoas."\n\n"Depois de criar um novo utilizador, essa pessoa precisa de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Pode partilhar este dispositivo com outras pessoas criando utilizadores adicionais. Cada utilizador tem o seu próprio espaço, que pode personalizar com as suas próprias aplicações, imagem de fundo e etc. Os utilizadores podem também ajustar as definições do tablet, como o Wi-Fi que afeta toda a gente."\n\n"Depois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois de criar um novo utilizador, essa pessoa necessita de passar por um processo de configuração."\n\n"Qualquer utilizador pode aceitar as permissões de aplicações atualizadas em nome de todos os outros utilizadores."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o utilizador agora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Certifique-se de que a pessoa está disponível para pegar no tablet e configurar o respetivo espaço"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar agora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"A gestão dos utilizadores só pode ser feita pelo proprietário do tablet."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"A gestão dos utilizadores só pode ser feita pelo proprietário do telemóvel."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Os perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar <xliff:g id="USER_NAME">%1$s</xliff:g> deste dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo utilizador"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Eliminar-se a si próprio?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remover utilizador?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Remover perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Perderá os dados e espaço neste tablet. Não é possível anular esta ação."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Perderá os dados e espaço neste telemóvel. Não é possível anular esta ação."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Os dados e espaço deste utilizador desaparecerão deste tablet. Não é possível anular esta ação."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Os dados e espaço deste utilizador desaparecerão deste telemóvel. Não é possível anular esta ação."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Os dados e o espaço deste perfil serão removidos deste tablet. Não é possível anular esta ação."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Os dados e o espaço deste perfil serão removidos deste telemóvel. Não é possível anular esta ação."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"A adicionar novo utilizador..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Eliminar utilizador"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Eliminar"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta definição afeta todos os utilizadores deste tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta definição afeta todos os utilizadores deste telemóvel."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões celulares"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a apresentar."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restrições à aplicação e conteúdo"</string>
+    <string name="user_rename" msgid="8523499513614655279">"MUDAR NOME"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Definir limites 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permitir a modificação de sincronizações e definições de Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permitir a troca de dados quando o tablet toca noutro dispositivo"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permitir a troca de dados quando o telemóvel toca noutro dispositivo"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Acesso à localização"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permitir que as aplicações utilizem as informações de localização"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Anterior"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Seguinte"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Terminar"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Tirar fotografia"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher fotografia da Galeria"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index ea55f7b..684b86b 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Devagar"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Rápida"</item>
-    <item msgid="2538100882620724753">"Muito rápida"</item>
+    <item msgid="1370673569131070146">"Mais rápida"</item>
+    <item msgid="4648206845228970803">"Muito rápida"</item>
+    <item msgid="4977949754169483251">"Rápida"</item>
+    <item msgid="6106302964845503577">"Muito rápida"</item>
+    <item msgid="6800277205640837264">"Máxima"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Muito baixa"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Nenhum"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Não especificado"</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">"Armazenamento do dispositivo interno"</item>
     <item msgid="3738430123799803530">"Cartão SD removível"</item>
     <item msgid="4498124044785815005">"Deixar o sistema decidir"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Local"</item>
+    <item msgid="255608127647030286">"Pessoal"</item>
+    <item msgid="4588829735729884491">"Mensagens"</item>
+    <item msgid="8971765125227378270">"Dispositivo"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"localização aproximada"</item>
+    <item msgid="5789673140227507995">"localização precisa"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibração"</item>
+    <item msgid="3434165993711230924">"ler contatos"</item>
+    <item msgid="616161687718081936">"modificar contatos"</item>
+    <item msgid="7638002295329050091">"ler registro de chamadas"</item>
+    <item msgid="6546959730920410907">"modificar registro de chamadas"</item>
+    <item msgid="446877710771379667">"ler agenda"</item>
+    <item msgid="7674458294386319722">"modificar agenda"</item>
+    <item msgid="8281201165558093009">"verificação de Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificação"</item>
+    <item msgid="7776439107987345446">"verificação de celular"</item>
+    <item msgid="514615766544675057">"chamar telefone"</item>
+    <item msgid="8181415497109310680">"ler SMS"</item>
+    <item msgid="6816551144382117307">"gravar SMS"</item>
+    <item msgid="4600463921908905030">"receber SMS"</item>
+    <item msgid="5958926493289432745">"receber SMS de emergência"</item>
+    <item msgid="4945269495221089540">"receber MMS"</item>
+    <item msgid="5570472453573929087">"receber WAP push"</item>
+    <item msgid="7125408150230860501">"enviar SMS"</item>
+    <item msgid="7080337936612188061">"ler SMS ICC"</item>
+    <item msgid="587124103118495063">"gravar SMS ICC"</item>
+    <item msgid="2320577158869025503">"modificar configurações"</item>
+    <item msgid="1545733463471924009">"sobrepor"</item>
+    <item msgid="3609046903962454582">"acessar notificações"</item>
+    <item msgid="4671646036128214513">"câmera"</item>
+    <item msgid="1097324338692486211">"gravar áudio"</item>
+    <item msgid="5031552983987798163">"reproduzir áudio"</item>
+    <item msgid="8374996688066472414">"ler a área de transferência"</item>
+    <item msgid="3045529469061083747">"modificar a área de transferência"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Local"</item>
+    <item msgid="8677040780775113033">"Local"</item>
+    <item msgid="1660743989948992916">"Local"</item>
+    <item msgid="8791172739860195290">"Vibração"</item>
+    <item msgid="383413555642128046">"Ler contatos"</item>
+    <item msgid="3654594895269697313">"Modificar contatos"</item>
+    <item msgid="7928393476362362538">"Ler registro de chamadas"</item>
+    <item msgid="6248591205254641116">"Modificar registro de chamadas"</item>
+    <item msgid="6093344633066170692">"Ler agenda"</item>
+    <item msgid="1334886368750347692">"Modificar agenda"</item>
+    <item msgid="1638204101698708656">"Local"</item>
+    <item msgid="2154671955760380322">"Postar notificação"</item>
+    <item msgid="4282477730595931828">"Local"</item>
+    <item msgid="4891423912898525905">"Chamar telefone"</item>
+    <item msgid="626463821668200388">"Receber SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Enviar SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Receber SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Receber SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Receber SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Receber SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Receber SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Enviar SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modificar configurações"</item>
+    <item msgid="736541391767350377">"Sobrepor"</item>
+    <item msgid="5530815681721654194">"Acessar notificações"</item>
+    <item msgid="781213371706962767">"Câmera"</item>
+    <item msgid="1720492593061838172">"Gravar áudio"</item>
+    <item msgid="3493046322001257041">"Reproduzir áudio"</item>
+    <item msgid="136815868796597058">"Ler a área de transferência"</item>
+    <item msgid="5238692940326972503">"Modificar a área de transferência"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Curto"</item>
     <item msgid="2560532955514699713">"Médio"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (gráficos)"</item>
     <item msgid="1340692776955662664">"Pilha de chamadas em glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Desativado"</item>
+    <item msgid="675719912558941285">"Desenhar região de corte não retangular em azul"</item>
+    <item msgid="1064373276095698656">"Destacar comandos de desenho testados em verde"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Desativado"</item>
+    <item msgid="2751513398307949636">"Na tela em barras"</item>
+    <item msgid="8272260411216018353">"Na tela em linhas"</item>
+    <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limite padrão"</item>
     <item msgid="4071574792028999443">"Sem processos em segundo plano"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b0ee489..6424db3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -265,10 +265,10 @@
     <string name="settings_label" msgid="1626402585530130914">"Configurações"</string>
     <string name="settings_label_launcher" msgid="8344735489639482340">"Config."</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Modo para avião"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fio e outras"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Gerenciar rede Wi-Fi, Bluetooth, modo avião, redes e VPNs"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes móveis e VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectar aos serviços de dados quando estiver em roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Conectar aos serviços de dados quando estiver em roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digite o texto a ser exibido na tela de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar informações do usuário ao bloquear a tela"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Dados do usuário"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar informações do perfil na tela de bloqueio"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acesso ao local"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
@@ -317,8 +319,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicite um PIN ou uma senha numérica para decodificar seu tablet sempre que o ligar"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicite um PIN ou senha numérica para decodificar seu telefone sempre que o ligar"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exigir um PIN numérico ou uma senha para decodificar seu tablet sempre que ligá-lo"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exigir um PIN numérico ou senha para decodificar seu telefone sempre que ligá-lo"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu telefone, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados."\n\n"A criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administradores do dispositivo"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visualizar ou desativar administradores do dispositivo"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Acesso a notificações"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Os aplicativos não podem ler notificações"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplicativo pode ler notificações"</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplicativos 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 aplicativo 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Lembrar configurações"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Display sem fio"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Para ver os dispositivos, ative o Display sem fio."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"O Display sem fio está desativado, pois o Wi-Fi está desligado."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"A visualização sem fio está desativada, pois o Wi-Fi está desligado."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Procurar displays"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Procurando..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nenhum display sem fio foi encontrado."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Quando este recurso está ativado, você pode enviar o conteúdo do aplicativo para outro dispositivo compatível com NFC, mantendo os dispositivos próximos. Por exemplo, você pode enviar páginas do navegador, vídeos do YouTube, contatos de pessoas e muito mais."\n\n"Basta posicionar os dispositivos próximos (normalmente de costas um para o outro) e tocar em sua tela. O aplicativo determina o que é enviado."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Detecção de serviço de rede"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permitir que aplicativos em outros dispositivos descubram aplicativos neste dispositivo"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Ativar Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Configurações de Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Ativar o Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Configurações de Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar e gerenciar pontos de acesso sem fio"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Selecionar Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Ativando Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Desativando Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selecionar Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Ativando Wi-Fi..."</string>
+    <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="3038290727701553612">"Receber notificação quando uma rede aberta estiver disponível"</string>
-    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões de baixa qualidade"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Manter Wi-Fi durante inatividade"</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_scan_always_available" msgid="3470564139944368030">"Verificação sempre disponível"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permitir que o serviço de localização do Google e outros aplicativos verifiquem redes, mesmo que o Wi-Fi esteja desligado"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalar certificados"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Para aumentar a precisão da localização e para outras finalidades, o Google e outros aplicativos podem verificar redes próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Os aplicativos podem verificar redes Wi-Fi próximas, mesmo que o Wi-Fi esteja desligado. Para impedir, vá para \"Avançado &gt; Verificação sempre disponível\"."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Não mostrar novamente"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Manter Wi-Fi durante inatividade"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ocorreu um problema com a mudança de configuração"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Otimização de Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimizar o uso da bateria quando o Wi-Fi estiver ligado"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Otimização de Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimizar o uso da bateria quando o Wi-Fi estiver ligado"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adicionar rede"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Redes Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Redes Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Botão de pressão WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Mais opções"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entrada de PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer a rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Para ver as redes disponíveis, ative o Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Procurando redes Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver as redes disponíveis, ative o Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Procurando redes Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Você não tem permissão para alterar a rede Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Outra rede..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mais"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Configuração automática (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Para concluir a configuração, o tablet precisa de acesso à rede Wi-Fi. Após a instalação, você poderá alternar entre os dados móveis e o Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Para concluir a configuração, o tablet precisa de acesso à rede Wi-Fi. Após a instalação, você poderá alternar entre os dados móveis e o Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Mostrar opções avançadas"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Config. protegida do Wi-Fi"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"Insira o pin <xliff:g id="NUMBER">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</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_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="5754399645462924103">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"A WPS já está em andamento e pode levar até dois minutos para ser concluída"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Falha na WPS. Tente novamente em alguns minutos."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A configuração de segurança do roteador sem fio (WEP) não é suportada"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Falha na autenticação. Tente novamente."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Outra sessão WPS foi detectada. Tente novamente em alguns minutos."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da rede"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Digite o SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Segurança"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Potência do sinal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -595,12 +614,15 @@
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Conexão com a Internet de baixa qualidade evitada"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Não está dentro do alcance"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</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_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Permitir isto para todos os aplicativos que quiserem verificar?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Negar"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectar"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Falha ao conectar à rede"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Esquecer"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Não ignorar"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVISO: você poderá receber cobranças significativas de dados da operadora."\n\n"A configuração do tablet pode exigir atividade de rede significativa."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVISO: você poderá receber cobranças significativas de dados da operadora."\n\n"A configuração do telefone pode exigir atividade de rede significativa."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVISO: o tablet não será capaz de verificar a atualização do software."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVISO: o telefone não será capaz de verificar a atualização do software."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"O telefone não foi capaz de conectar à rede Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi avançado"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Banda de frequência Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVISO: o tablet não poderá verificar a atualização do software até conectar-se à Internet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVISO: o telefone não poderá verificar a atualização do software até conectar-se à Internet."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"O tablet não foi capaz de conectar à rede Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"O telefone não foi capaz de conectar à rede Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançado"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Banda de frequência Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Especifique a faixa de frequência da operação"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Houve um erro ao configurar a banda de frequência."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Endereço MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Tamanho do pref. de rede"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informações do dispositivo"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Lembrar esta conexão"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Pesquisar dispositivos"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Esquecer este grupo?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi portátil"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Ponto de acesso Wi-Fi portátil"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ponto de acesso portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ativo"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro de ponto de acesso Wi-Fi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Config. ponto de acesso Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"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_failed_subtext" msgid="1484941858530919002">"Erro de ponto de acesso Wi-Fi portátil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar ponto de acesso Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
@@ -692,19 +714,19 @@
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configurações de dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Áudio"</string>
-    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configurações para o dock do computador anexo"</string>
-    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configurações para o dock do carro anexo"</string>
+    <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Configurações para a dock conectada ao computador"</string>
+    <string name="dock_audio_summary_car" msgid="6740897586006248450">"Configurações para a dock p/ carro conectada"</string>
     <string name="dock_audio_summary_none" product="tablet" msgid="8215337394914283607">"Tablet não encaixado"</string>
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"Telefone não encaixado"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configurações para o dock anexo"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"Dock não encontrado"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"É necessário que você encaixe seu tablet antes de configurar o áudio do dock."</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"É necessário que você encaixe o telefone antes de configurar o áudio do dock."</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Som de inserção no dock"</string>
-    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduzir sons ao inserir ou remover o tablet do dock"</string>
-    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduzir sons ao inserir ou remover o telefone do dock."</string>
-    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Não reproduzir sons ao inserir ou remover o tablet do dock"</string>
-    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Não reproduzir sons ao inserir ou remover o telefone do dock."</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"É necessário que você encaixe seu tablet antes de configurar o áudio da dock."</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"É necessário que você encaixe o telefone antes de configurar o áudio da dock."</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Som de inserção na dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Reproduzir sons ao inserir ou remover o tablet da dock"</string>
+    <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Reproduzir sons ao inserir ou remover o telefone da dock."</string>
+    <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Não reproduzir sons ao inserir ou remover o tablet da dock"</string>
+    <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Não reproduzir sons ao inserir ou remover o telefone da dock."</string>
     <string name="account_settings" msgid="6403589284618783461">"Contas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Potência do sinal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Rede"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Endereço MAC da rede Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Endereço MAC da rede Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Endereço Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Número de série"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Não disponível"</string>
@@ -845,7 +867,7 @@
     <string name="storage_title_usb" msgid="679612779321689418">"Conexão USB do computador"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Conectar-se como"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Dispositivo de mídia (MTP)"</string>
-    <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.br/filetransfer."</string>
+    <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>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN ativado"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN desativado"</string>
     <string name="bearer" msgid="594270280031923558">"Portador"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tipo de MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valor de MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Excluir APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Novo APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvar"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajuda"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Redes móveis"</string>
     <string name="location_title" msgid="1029961368397484576">"Meu Local"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Local de rede móvel e Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Local de rede móvel e Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Permitir que os aplicativos 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="7457348712272184793">"Localização determinada por Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Localização determinada por Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satélites de GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permitir que os aplicativos usem o GPS do tablet para determinar sua posição"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Permitir que os aplicativos usem o GPS do telefone para determinar sua posição"</string>
@@ -966,8 +990,8 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Usar servidor para auxiliar GPS (desmarque para aprimorar o desempenho do GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Local. e pesq. do Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Permitir que o Google use sua localização para melhorar os resultados de pesquisa e outros serviços"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Acesso a minha localização"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Permitir que os aplicativos que solicitaram sua permissão usem seus dados de localização"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Acesso à localização"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Permitir a aplicativos que solicitaram permissão usem seus dados de local"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Fontes de localização"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Sobre o tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Sobre o telefone"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtro"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Selecione as opções de filtro"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Todos"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Desativados"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descarregados"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Rodando"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Armazenamento USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Se você desativar um aplicativo integrado, outros aplicativos poderão apresentar problemas. Seus dados também serão excluídos."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Desativar notificações?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Se você desativar as notificações para este aplicativo, poderá perder alertas e atualizações importantes."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Operações de aplicativos"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca usado)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uso do armazenamento"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visualizar armazenamento usado pelos aplicativos"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Palavra:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Atalho:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Idioma:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Digite uma palavra"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Atalho opcional"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palavra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Excluir"</string>
@@ -1260,9 +1290,11 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Configurações de teclado físico"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opções do desenvolvedor"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Define as opções para o desenvolvimento do aplicativo"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"As opções do desenvolvedor não estão disponíveis para este usuário"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Relatórios de bugs no menu do botão de ligar"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"Relat. de bugs menu do b. ligar"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir a opção de obter um relatório de bugs no menu do botão de ligar"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</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 aplicativos 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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ativar as configurações de desenvolvimento?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Essas configurações são destinadas apenas para o uso de desenvolvedores. Elas podem causar a desativação ou mau funcionamento do dispositivo e dos aplicativos contidos nele."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificar aplicativos por USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Botão de ligar encerra a chamada"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Falar senhas"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Atraso ao tocar e pressionar"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Melhorar a acessibilidade na Web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configurações"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Ativado"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desativado"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permitido"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Não permitido"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permitir"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Não permitir"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Usar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"O <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pode coletar todo o texto que você digitar, exceto senhas. Isso inclui dados pessoais, como números de cartão de crédito. Ele também pode coletar dados sobre sua interação com o tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"O <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> pode coletar todo o texto que você digitar, exceto senhas. Isso inclui dados pessoais, como números de cartão de crédito. Ele também pode coletar dados sobre sua interação com o telefone."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Tocar em OK irá parar <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar suas ações"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Receber notificações ao interagir com um aplicativo."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Parar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Toque em \"Ok\" para parar <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nenhum serviço foi instalado"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Precisa de um leitor de tela?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"O TalkBack fornece feedback por voz para ajudar usuários cegos ou com visão reduzida. Deseja instalá-lo gratuitamente do Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Deseja que seus aplicativos instalem scripts do Google para que seu conteúdo da web seja mais acessível?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nenhuma descrição foi fornecida."</string>
     <string name="settings_button" msgid="3006713718908152930">"Configurações"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Bateria"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Carregando"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Tela ativada"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS ligado"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Ativo"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinal da rede móvel"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Tempo ativo do aparelho"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Tempo ativo da rede Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Tempo ativo da rede Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ativação da rede Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ativação da rede Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalhes do histórico"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalhes de uso"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustar uso de energia"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pacotes incluídos"</string>
     <string name="power_screen" msgid="3023346080675904613">"Tela"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Célula em espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
@@ -1369,30 +1397,30 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU prioritária"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Permanecer ativo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi em execução"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi em execução"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefone"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dados enviados"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Dados recebidos"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Áudio"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Vídeo"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"Horário de ativação"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tempo ligado"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Horário sem o sinal"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forçar parada"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informações do aplicativo"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configurações do aplicativo"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configurações da tela"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Configurações de Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Configurações de Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Conf. de Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateria usada por chamadas de voz"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateria usada quando o tablet está ocioso"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Bateria usada quando o telefone está ocioso"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Bateria usada por rádio celular"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Alternar para o modo para avião para economizar energia nas áreas sem cobertura celular"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Alternar para o modo avião para economizar energia nas áreas sem cobertura celular"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateria usada pela tela e pela luz de fundo"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduzir o brilho e/ou o tempo limite da tela"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateria usada por Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Desativar rede Wi-Fi quando não estiver em uso ou disponível"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Bateria usada por Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Desativar Wi-Fi quando não estiver em uso ou disponível"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bateria usada por Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Desativar Bluetooth quando não estiver em uso"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Tente conectar a um dispositivo Bluetooth diferente"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configurar"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Selecione outro mecanismo"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Este mecanismo de síntese de fala pode coletar todo texto que será falado, inclusive dados pessoais como senhas e números de cartão de crédito. Ele é proveniente do mecanismo <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Deseja ativar o uso desse mecanismo de síntese de fala?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Este idioma requer uma conexão de rede ativa para a conversão de texto em voz."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mecanismos"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Configurações de <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> foi ativado"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Mecanismo preferencial"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Gerais"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Controle de energia"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Atualizando configuração Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Atualizando configuração de Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Atualizando configuração Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"ativado"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"desativado"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"ativando"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desativando"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronização"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de armazenamento"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Somente software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Backup e restauração"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dados pessoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Fazer backup"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Fazer backup de dados de aplicativos, senhas da rede Wi-Fi e outras configurações nos servidores do Google"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Fazer backup de dados de aplicativos, 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="auto_restore_title" msgid="5397528966329126506">"Restauração automática"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"A nova senha e a confirmação não coincidem."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Falha ao definir a senha de backup"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Interromper o backup de suas senhas Wi-Fi, favoritos, outras configurações e dados de aplicativos e apagar todas as cópias nos servidores do Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Interromper o backup de suas senhas de redes Wi-Fi, favoritos, outras configurações e dados de aplicativos e apagar todas as cópias nos servidores do Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Configurações de administração do dispositivo"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrador do dispositivo"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Desativar"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificações"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Toque e vibração de chamadas"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistema"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configuração de Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectar a uma rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Conectando-se à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectado uma rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configuração de Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Conectar-se à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Conectando-se à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adicionar uma rede"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Não conectado"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adicionar rede"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Conectando..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Ir para a próxima etapa"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP não é suportado."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Não é possível configurar uma conexão Wi-Fi EAP durante a configuração. É possível fazer isso em seguida, na opção Configurações &gt; Sem fio &amp; redes."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Não é possível configurar uma conexão Wi-Fi EAP durante a configuração. É possível fazer isso em seguida, na opção \"Configurações\" &gt; \"Sem fio e redes\"."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"A conexão pode levar alguns minutos..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Toque em "<b>"Próximo"</b>" para continuar a configuração."\n\n"Toque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Próximo"</b>" para continuar a configuração."\n\n"Toque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Aplic. que sofreu dep. aguarda que depur. seja anex. antes da exec."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Entrada"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Desenho"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Renderização acelerada por hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitoramento"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modo rigoroso ativado"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Piscar tela se aplic. demorarem na sequência princ."</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Melhor p/ pior: azul, verde, verm. claro, vermelho"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Desativar sobreposição HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Ativar traços"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Selecionar traços ativados"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Nenhum traço ativado"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> traços ativados"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Todos os traços ativados"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Ativar rastream. OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Mostrar limites de layout"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar limites de corte, margens, etc."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forçar uso da GPU para desenho em 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forçar 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Ativar 4x MSAA em aplicativos OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Depurar operações de corte não retangulares"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Classific. render. GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Medir tempo render. em adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Escala de anim. da janela"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limite do proc. 2º plano"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Mostrar todos os ANRS"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Exibir \"App não responde\" para aplic. em 2º plano"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Usar WebView experimental"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Os aplicativos usarão o WebView mais novo (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Uso de dados"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclo do uso de dados"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de dados"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restringir dados de 2º plano"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separar uso dos dados 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Mostrar uso do Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Mostrar uso do Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Mostrar o uso da Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Pontos de acesso móveis"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizar dados automaticamente"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Definir limite de dados móveis"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Definir limite de dados 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Definir limite de dados 2G/3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Definir limite de dados Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Limitar dados de Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Móvel"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu tablet, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Sua conexão de dados móveis será desativada quando o limite especificado for atingido."\n\n"Como o uso de dados é calculado por seu telefone, e sua operadora pode entender o uso de forma diferente, use um limite moderado."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restringir dados de segundo plano?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Se você restringir os dados móveis de segundo plano, alguns aplicativos e serviços não funcionarão, a menos que você esteja conectado a uma rede Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ao restringir os dados móveis em plano de fundo, alguns aplicativos e serviços não funcionarão a menos que você esteja conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do tablet."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ao restringir os dados móveis em plano de fundo, alguns aplicativos e serviços não funcionarão a menos que você esteja conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do telefone."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do tablet."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ao restringir os dados móveis em segundo plano, alguns aplicativos e serviços só funcionarão se você estiver conectado a uma rede Wi-Fi."\n\n"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"aviso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicativos removidos"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> usados (cálculo do tablet). Cálculo da operadora poderá ser diferente."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> usados (cálculo do tel). Cálculo da operadora poderá ser diferente."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Pontos de acesso de dispositivos móveis"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selecione as redes Wi-Fi que são pontos de acesso móveis. Aplicativos em segundo plano podem ser impedidos de usar essas redes. Os aplicativos também podem avisar antes de usar essas redes para grandes downloads."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selecione as redes Wi-Fi que são pontos de acesso móveis. Aplicativos em segundo plano podem ser impedidos de usar essas redes. Os aplicativos também podem avisar antes de usar essas redes para grandes downloads."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móveis"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Redes Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Para selecionar pontos de acesso para dispositivos móveis, ligue o Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Redes Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Para selecionar pontos de acesso móveis, ligue o Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Chamada de emergência"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Retornar à chamada"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nome"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissivo"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Impondo"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Usuários"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Você"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Outros usuários"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adicionar usuário"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Ativo"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inativo"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Usuários e perfis"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Adicionar usuário ou perfil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Perfil restrito"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Antes de criar um perfil restrito, configure um bloqueio de tela para proteger seus aplicativos e seus dados pessoais."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Definir bloqueio"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Não configurado"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Não configurado - perfil restrito"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietário"</string>
+    <string name="user_you" msgid="1639158809315025986">"Você (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Apelido"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Adicionar"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Usuários padrão têm seus próprios aplicativos e conteúdo"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"É possível restringir o acesso a aplicativos e conteúdo a partir de sua conta"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Usuário"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Perfil restrito"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adicionar novo usuário"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Compartilhe este dispositivo com outras pessoas criando usuários adicionais. Cada usuário terá seu próprio espaço, que poderá personalizar com seus próprios aplicativos, plano de fundo, etc. Os usuários também poderão ajustar configurações do tablet que afetam a todos, como o Wi-Fi."\n\n"Depois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração."\n\n"Qualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Compartilhe este dispositivo com outras pessoas criando usuários adicionais. Cada usuário terá seu próprio espaço, que poderá personalizar com seus próprios aplicativos, plano de fundo, etc. Os usuários também poderão ajustar configurações do tablet que afetam a todos, como o Wi-Fi."\n\n"Depois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração."\n\n"Qualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Depois que você cria um novo usuário, essa pessoa deve concluir o processo de configuração."\n\n"Qualquer usuário poderá aceitar permissões atualizadas de aplicativos em nome de todos os demais."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configurar o usuário agora?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Certifique-se de que a pessoa está disponível para assumir o tablet e configurar seu espaço"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurar perfil agora?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configurar agora"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Agora não"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Perfis restritos não podem adicionar contas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Excluir <xliff:g id="USER_NAME">%1$s</xliff:g> do dispositivo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novo usuário"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Novo perfil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Excluir a si mesmo?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Remover usuário?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Remover perfil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Você perderá seu espaço e seus dados no tablet. Não é possível desfazer esta ação."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Você perderá seu espaço e seus dados no telefone. Não é possível desfazer esta ação."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"O espaço e os dados do usuário desaparecerão do tablet. Não é possível desfazer esta ação."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"O espaço e os dados do usuário desaparecerão do telefone. Não é possível desfazer esta ação."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"O espaço e os dados do perfil desaparecerão do tablet. Não é possível desfazer esta ação."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"O espaço e os dados do perfil desaparecerão do telefone. Não é possível desfazer esta ação."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Adicionando novo usuário..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Excluir usuário"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Excluir"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Permitir aplicativos e conteúdo"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplicativos com restrições"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Expandir config. p/ aplicativo"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Esta configuração afeta todos os usuários do tablet."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Esta configuração afeta todos os usuários do telefone."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Alterar idioma"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a exibir."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restrições de aplic. e conteúdo"</string>
+    <string name="user_rename" msgid="8523499513614655279">"RENOMEAR"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Definir limites do aplicativo"</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 aplicativo não é compatível com perfis restritos"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"Este aplicativo pode acessar suas contas"</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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permitir modificação dos pareamentos e configurações de Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permitir troca de dados quando o tablet tocar em outro dispositivo"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permitir troca de dados quando o telefone tocar em outro dispositivo"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Acesso ao local"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permitir que os aplicativos utilizem suas informações de local"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Voltar"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Próximo"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Concluir"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Tirar foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher foto da Galeria"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index dbfebfc..436d800 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -57,13 +57,11 @@
     <!-- no translation found for entries_font_size:2 (1678068858001018666) -->
     <!-- no translation found for entries_font_size:3 (7786168277516233536) -->
     <!-- no translation found for entries_font_size:3 (490158884605093126) -->
-  <string-array name="tts_rate_entries">
-    <item msgid="6041212618892492920">"Fitg plaun"</item>
-    <item msgid="2361722960903353554">"Plaun"</item>
-    <item msgid="1145554631248513562">"Normal"</item>
-    <item msgid="7553665153391107454">"Svelt"</item>
-    <item msgid="2538100882620724753">"Fitg svelt"</item>
-  </string-array>
+    <!-- no translation found for tts_rate_entries:4 (1370673569131070146) -->
+    <!-- no translation found for tts_rate_entries:5 (4648206845228970803) -->
+    <!-- no translation found for tts_rate_entries:6 (4977949754169483251) -->
+    <!-- no translation found for tts_rate_entries:7 (6106302964845503577) -->
+    <!-- no translation found for tts_rate_entries:8 (6800277205640837264) -->
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Fitg bass"</item>
     <item msgid="2692137425242433765">"Bass"</item>
@@ -82,6 +80,9 @@
     <!-- 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) -->
+    <!-- no translation found for wifi_ap_security:2 (3112452131886885338) -->
     <!-- no translation found for wifi_eap_method:3 (435667726254379514) -->
     <!-- no translation found for wifi_p2p_wps_setup:0 (5085064298144493867) -->
     <!-- no translation found for wifi_p2p_wps_setup:1 (1624323946324499595) -->
@@ -114,6 +115,9 @@
     <!-- no translation found for usage_stats_display_order_types:1 (3703676222230317933) -->
     <!-- no translation found for usage_stats_display_order_types:2 (2502754479975776899) -->
     <!-- no translation found for wifi_eap_entries:3 (2318274046749286642) -->
+    <!-- no translation found for wifi_peap_phase2_entries:0 (2577747762745812488) -->
+    <!-- no translation found for wifi_peap_phase2_entries:1 (937786527870979616) -->
+    <!-- no translation found for wifi_peap_phase2_entries:2 (5302613883318643629) -->
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nagina"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -142,11 +146,81 @@
     <!-- no translation found for bearer_entries:0 (1770285336669531300) -->
     <!-- no translation found for bearer_entries:1 (3044323519470167625) -->
     <!-- no translation found for bearer_entries:2 (6848428671997893147) -->
+    <!-- no translation found for mvno_type_entries:0 (4367119357633573465) -->
+    <!-- no translation found for mvno_type_entries:1 (6062567900587138000) -->
+    <!-- no translation found for mvno_type_entries:2 (2454085083342423481) -->
+    <!-- no translation found for mvno_type_entries:3 (2681427309183221543) -->
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Memoria interna da telefonin"</item>
     <item msgid="3738430123799803530">"Carta SD che po vegnir barattada"</item>
     <item msgid="4498124044785815005">"Laschar decider il sistem"</item>
   </string-array>
+    <!-- no translation found for app_ops_categories:0 (6358963769537892925) -->
+    <!-- no translation found for app_ops_categories:1 (255608127647030286) -->
+    <!-- no translation found for app_ops_categories:2 (4588829735729884491) -->
+    <!-- no translation found for app_ops_categories:3 (8971765125227378270) -->
+    <!-- no translation found for app_ops_summaries:0 (4979188868761515915) -->
+    <!-- no translation found for app_ops_summaries:1 (5789673140227507995) -->
+    <!-- no translation found for app_ops_summaries:2 (1061584358377390581) -->
+    <!-- no translation found for app_ops_summaries:3 (5387405117297558954) -->
+    <!-- no translation found for app_ops_summaries:4 (3434165993711230924) -->
+    <!-- no translation found for app_ops_summaries:5 (616161687718081936) -->
+    <!-- no translation found for app_ops_summaries:6 (7638002295329050091) -->
+    <!-- no translation found for app_ops_summaries:7 (6546959730920410907) -->
+    <!-- no translation found for app_ops_summaries:8 (446877710771379667) -->
+    <!-- no translation found for app_ops_summaries:9 (7674458294386319722) -->
+    <!-- no translation found for app_ops_summaries:10 (8281201165558093009) -->
+    <!-- no translation found for app_ops_summaries:11 (8694611243479480497) -->
+    <!-- no translation found for app_ops_summaries:12 (7776439107987345446) -->
+    <!-- no translation found for app_ops_summaries:13 (514615766544675057) -->
+    <!-- no translation found for app_ops_summaries:14 (8181415497109310680) -->
+    <!-- no translation found for app_ops_summaries:15 (6816551144382117307) -->
+    <!-- no translation found for app_ops_summaries:16 (4600463921908905030) -->
+    <!-- no translation found for app_ops_summaries:17 (5958926493289432745) -->
+    <!-- no translation found for app_ops_summaries:18 (4945269495221089540) -->
+    <!-- no translation found for app_ops_summaries:19 (5570472453573929087) -->
+    <!-- no translation found for app_ops_summaries:20 (7125408150230860501) -->
+    <!-- no translation found for app_ops_summaries:21 (7080337936612188061) -->
+    <!-- no translation found for app_ops_summaries:22 (587124103118495063) -->
+    <!-- no translation found for app_ops_summaries:23 (2320577158869025503) -->
+    <!-- no translation found for app_ops_summaries:24 (1545733463471924009) -->
+    <!-- no translation found for app_ops_summaries:25 (3609046903962454582) -->
+    <!-- no translation found for app_ops_summaries:26 (4671646036128214513) -->
+    <!-- no translation found for app_ops_summaries:27 (1097324338692486211) -->
+    <!-- no translation found for app_ops_summaries:28 (5031552983987798163) -->
+    <!-- no translation found for app_ops_summaries:29 (8374996688066472414) -->
+    <!-- no translation found for app_ops_summaries:30 (3045529469061083747) -->
+    <!-- no translation found for app_ops_labels:0 (6602854600289714121) -->
+    <!-- no translation found for app_ops_labels:1 (8677040780775113033) -->
+    <!-- no translation found for app_ops_labels:2 (1660743989948992916) -->
+    <!-- no translation found for app_ops_labels:3 (8791172739860195290) -->
+    <!-- no translation found for app_ops_labels:4 (383413555642128046) -->
+    <!-- no translation found for app_ops_labels:5 (3654594895269697313) -->
+    <!-- no translation found for app_ops_labels:6 (7928393476362362538) -->
+    <!-- no translation found for app_ops_labels:7 (6248591205254641116) -->
+    <!-- no translation found for app_ops_labels:8 (6093344633066170692) -->
+    <!-- no translation found for app_ops_labels:9 (1334886368750347692) -->
+    <!-- no translation found for app_ops_labels:10 (1638204101698708656) -->
+    <!-- no translation found for app_ops_labels:11 (2154671955760380322) -->
+    <!-- no translation found for app_ops_labels:12 (4282477730595931828) -->
+    <!-- no translation found for app_ops_labels:13 (4891423912898525905) -->
+    <!-- no translation found for app_ops_labels:14 (626463821668200388) -->
+    <!-- no translation found for app_ops_labels:15 (1237538540368797101) -->
+    <!-- no translation found for app_ops_labels:16 (3986142739951490025) -->
+    <!-- no translation found for app_ops_labels:17 (3984213795861739778) -->
+    <!-- no translation found for app_ops_labels:18 (3656243523752472788) -->
+    <!-- no translation found for app_ops_labels:19 (8105802370238551510) -->
+    <!-- no translation found for app_ops_labels:20 (1407766984645388488) -->
+    <!-- no translation found for app_ops_labels:21 (1530132603376027248) -->
+    <!-- no translation found for app_ops_labels:22 (1188256962149204607) -->
+    <!-- no translation found for app_ops_labels:23 (4218544235221631789) -->
+    <!-- no translation found for app_ops_labels:24 (736541391767350377) -->
+    <!-- no translation found for app_ops_labels:25 (5530815681721654194) -->
+    <!-- no translation found for app_ops_labels:26 (781213371706962767) -->
+    <!-- no translation found for app_ops_labels:27 (1720492593061838172) -->
+    <!-- no translation found for app_ops_labels:28 (3493046322001257041) -->
+    <!-- no translation found for app_ops_labels:29 (136815868796597058) -->
+    <!-- no translation found for app_ops_labels:30 (5238692940326972503) -->
     <!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
     <!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
     <!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
@@ -186,6 +260,13 @@
     <!-- no translation found for enable_opengl_traces_entries:1 (9089630089455370183) -->
     <!-- no translation found for enable_opengl_traces_entries:2 (5397807424362304288) -->
     <!-- no translation found for enable_opengl_traces_entries:3 (1340692776955662664) -->
+    <!-- no translation found for show_non_rect_clip_entries:0 (993742912147090253) -->
+    <!-- no translation found for show_non_rect_clip_entries:1 (675719912558941285) -->
+    <!-- no translation found for show_non_rect_clip_entries:2 (1064373276095698656) -->
+    <!-- no translation found for track_frame_time_entries:0 (2193584639058893150) -->
+    <!-- no translation found for track_frame_time_entries:1 (2751513398307949636) -->
+    <!-- no translation found for track_frame_time_entries:2 (8272260411216018353) -->
+    <!-- no translation found for track_frame_time_entries:3 (120512413928262547) -->
     <!-- no translation found for app_process_limit_entries:0 (3401625457385943795) -->
     <!-- no translation found for app_process_limit_entries:1 (4071574792028999443) -->
     <!-- no translation found for app_process_limit_entries:2 (4810006996171705398) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 399f4f7..7fe1a5f 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -364,7 +364,8 @@
     <skip />
     <!-- no translation found for wireless_networks_settings_title (3643009077742794212) -->
     <skip />
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Configurar WLAN, bluetooth, il modus d\'aviun, las raits mobilas e VPN"</string>
+    <!-- no translation found for radio_controls_summary (1838624369870907268) -->
+    <skip />
     <string name="roaming" msgid="3596055926335478572">"Roaming da datas"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Connectar als servetschs da datas cun roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Connectar als servetschs da datas sche roaming vegn utilisà"</string>
@@ -432,6 +433,10 @@
     <skip />
     <!-- no translation found for user_info_settings_title (1195015434996724736) -->
     <skip />
+    <!-- no translation found for show_profile_info_on_lockscreen_label (2741208907263877990) -->
+    <skip />
+    <!-- no translation found for profile_info_settings_title (3518603215935346604) -->
+    <skip />
     <!-- no translation found for location_settings_title (4483843407328665068) -->
     <skip />
     <!-- no translation found for security_settings_title (7945465324818485460) -->
@@ -594,6 +599,18 @@
     <skip />
     <!-- no translation found for manage_device_admin_summary (7672709110988761075) -->
     <skip />
+    <!-- no translation found for manage_notification_access (5799781079264981979) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_nonzero:one (8344183614159211585) -->
+    <!-- no translation found for manage_notification_access_summary_nonzero:other (980049191810249052) -->
+    <!-- no translation found for no_notification_listeners (2767405417723149879) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_title (6494221261778885893) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_summary (2780319203595885564) -->
+    <skip />
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <!-- no translation found for bluetooth_settings (1810521656168174329) -->
@@ -714,7 +731,7 @@
     <skip />
     <!-- no translation found for wifi_display_settings_empty_list_wifi_display_off (1225626898926363100) -->
     <skip />
-    <!-- no translation found for wifi_display_settings_empty_list_wifi_display_disabled (7363832031876872257) -->
+    <!-- no translation found for wifi_display_settings_empty_list_wifi_display_disabled (1336244693183075466) -->
     <skip />
     <!-- no translation found for wifi_display_search_for_devices (5065526281193354502) -->
     <skip />
@@ -774,19 +791,22 @@
     <skip />
     <!-- no translation found for nsd_quick_toggle_summary (155692215972781276) -->
     <skip />
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"WLAN"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activar WLAN"</string>
-    <!-- no translation found for wifi_settings (1277428034634973011) -->
+    <!-- no translation found for wifi_quick_toggle_title (8850161330437693895) -->
     <skip />
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Parameters WLAN"</string>
-    <!-- no translation found for wifi_settings_title (4351120897298124250) -->
+    <!-- no translation found for wifi_quick_toggle_summary (2696547080481267642) -->
+    <skip />
+    <!-- no translation found for wifi_settings (29722149822540994) -->
+    <skip />
+    <!-- no translation found for wifi_settings_category (8719175790520448014) -->
+    <skip />
+    <!-- no translation found for wifi_settings_title (3103415012485692233) -->
     <skip />
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configurar &amp; administrar ils puncts d\'access WLAN"</string>
-    <!-- no translation found for wifi_setup_wizard_title (70277346338812325) -->
+    <!-- no translation found for wifi_setup_wizard_title (8242230950011819054) -->
     <skip />
-    <!-- no translation found for wifi_starting (6716593470710880000) -->
+    <!-- no translation found for wifi_starting (6732377932749942954) -->
     <skip />
-    <!-- no translation found for wifi_stopping (244864762599017659) -->
+    <!-- no translation found for wifi_stopping (8952524572499500804) -->
     <skip />
     <string name="wifi_error" msgid="3207971103917128179">"Errur"</string>
     <!-- no translation found for wifi_in_airplane_mode (8652520421778203796) -->
@@ -797,35 +817,50 @@
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"M\'avisar sch\'ina rait averta è disponibla"</string>
     <!-- no translation found for wifi_poor_network_detection (4925789238170207169) -->
     <skip />
-    <!-- no translation found for wifi_poor_network_detection_summary (2466956369738047669) -->
+    <!-- no translation found for wifi_poor_network_detection_summary (7843672905900544785) -->
     <skip />
-    <!-- no translation found for wifi_setting_sleep_policy_title (9107237003911220057) -->
+    <!-- no translation found for wifi_scan_always_available (3470564139944368030) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_available_summary (7768204638882691453) -->
+    <skip />
+    <!-- no translation found for wifi_install_credentials (3551143317298272860) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_on (8135076005488914200) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_text_location_off (6323983741393280935) -->
+    <skip />
+    <!-- no translation found for wifi_scan_notify_remember_choice (5340097010842405981) -->
+    <skip />
+    <!-- no translation found for wifi_setting_sleep_policy_title (5149574280392680092) -->
     <skip />
     <!-- no translation found for wifi_setting_sleep_policy_error (8174902072673071961) -->
     <skip />
-    <!-- no translation found for wifi_suspend_optimizations (387215679583759376) -->
+    <!-- no translation found for wifi_suspend_optimizations (1220174276403689487) -->
     <skip />
-    <!-- no translation found for wifi_suspend_optimizations_summary (7774946457510541054) -->
+    <!-- no translation found for wifi_suspend_optimizations_summary (4151428966089116856) -->
     <skip />
     <!-- no translation found for wifi_add_network (6234851776910938957) -->
     <skip />
-    <string name="wifi_access_points" msgid="2664629396767022441">"Raits WLAN"</string>
+    <!-- no translation found for wifi_access_points (7053990007031968609) -->
+    <skip />
     <!-- no translation found for wifi_menu_wps_pbc (2668564692207863017) -->
     <skip />
     <!-- no translation found for wifi_menu_more_options (2448097861752719396) -->
     <skip />
     <!-- no translation found for wifi_menu_wps_pin (6426448256268695933) -->
     <skip />
-    <!-- no translation found for wifi_menu_p2p (2575893749303670353) -->
+    <!-- no translation found for wifi_menu_p2p (7619851399250896797) -->
     <skip />
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tschertgar"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzà"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connectar cun la rait"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Allontanar la rait"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Midar la rait"</string>
-    <!-- no translation found for wifi_empty_list_wifi_off (4722299515264875943) -->
+    <!-- no translation found for wifi_empty_list_wifi_off (8056223875951079463) -->
     <skip />
-    <!-- no translation found for wifi_empty_list_wifi_on (3354911729026237372) -->
+    <!-- no translation found for wifi_empty_list_wifi_on (8746108031587976356) -->
+    <skip />
+    <!-- no translation found for wifi_empty_list_user_restricted (8280257225419947565) -->
     <skip />
     <!-- no translation found for wifi_other_network (1048006316504242214) -->
     <skip />
@@ -833,21 +868,21 @@
     <skip />
     <!-- no translation found for wifi_setup_wps (8128702488486283957) -->
     <skip />
-    <!-- no translation found for wifi_required_info_text (9014073093293520112) -->
+    <!-- no translation found for wifi_required_info_text (4080969509965288881) -->
     <skip />
     <!-- no translation found for wifi_show_advanced (1793703023711426246) -->
     <skip />
-    <!-- no translation found for wifi_wps_setup_title (6034518116333042484) -->
+    <!-- no translation found for wifi_wps_setup_title (8207552222481570175) -->
     <skip />
     <!-- no translation found for wifi_wps_setup_msg (315174329121275092) -->
     <skip />
-    <!-- no translation found for wifi_wps_onstart_pbc (7204827509934892103) -->
+    <!-- no translation found for wifi_wps_onstart_pbc (5940801028985255304) -->
     <skip />
-    <!-- no translation found for wifi_wps_onstart_pin (8067502591043979939) -->
+    <!-- no translation found for wifi_wps_onstart_pin (223344506445335358) -->
     <skip />
     <!-- no translation found for wifi_wps_complete (2388138550456729134) -->
     <skip />
-    <!-- no translation found for wifi_wps_connected (5754399645462924103) -->
+    <!-- no translation found for wifi_wps_connected (7153432445748931183) -->
     <skip />
     <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
     <skip />
@@ -862,6 +897,8 @@
     <!-- no translation found for wifi_wps_failed_overlap (5159533685596844778) -->
     <skip />
     <string name="wifi_ssid" msgid="641393708309146745">"SSID da la rait"</string>
+    <!-- no translation found for wifi_ssid_hint (897593601067321355) -->
+    <skip />
     <string name="wifi_security" msgid="6603611185592956936">"Segirezza"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Intensitad dal signal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -899,6 +936,12 @@
     <skip />
     <!-- no translation found for wifi_security_none (7985461072596594400) -->
     <skip />
+    <!-- no translation found for wifi_scan_always_turnon_message (203123538572122989) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_allow (5355973075896817232) -->
+    <skip />
+    <!-- no translation found for wifi_scan_always_confirm_deny (4463982053823520710) -->
+    <skip />
     <string name="wifi_connect" msgid="1076622875777072845">"Connectar"</string>
     <!-- no translation found for wifi_failed_connect_message (8491902558970292871) -->
     <skip />
@@ -910,31 +953,24 @@
     <skip />
     <string name="wifi_cancel" msgid="6763568902542968964">"Interrumper"</string>
     <!-- no translation found for wifi_skip_anyway (6965361454438011190) -->
-    <!-- no translation found for wifi_skip_anyway (5205612884736051138) -->
     <skip />
     <!-- no translation found for wifi_dont_skip (7350341524881124808) -->
     <skip />
     <!-- no translation found for wifi_skipped_message (3335132188969450252) -->
-    <!-- no translation found for wifi_skipped_message (6518433975501257341) -->
     <skip />
     <!-- no translation found for wifi_skipped_message (1192848364146401759) -->
-    <!-- no translation found for wifi_skipped_message (4376150150678208848) -->
     <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (7682836089429990118) -->
-    <!-- no translation found for wifi_and_mobile_skipped_message (5647058314212144925) -->
+    <!-- no translation found for wifi_and_mobile_skipped_message (6161024589991810940) -->
     <skip />
-    <!-- no translation found for wifi_and_mobile_skipped_message (3324261421359832263) -->
-    <!-- no translation found for wifi_and_mobile_skipped_message (1288483646141987070) -->
+    <!-- no translation found for wifi_and_mobile_skipped_message (3773473163264984767) -->
     <skip />
-    <!-- no translation found for wifi_connect_failed_message (6904081070290941807) -->
-    <!-- no translation found for wifi_connect_failed_message (2006689630582761529) -->
+    <!-- no translation found for wifi_connect_failed_message (4474691090681670156) -->
     <skip />
-    <!-- no translation found for wifi_connect_failed_message (3894921379368046855) -->
-    <!-- no translation found for wifi_connect_failed_message (8220901976514642385) -->
+    <!-- no translation found for wifi_connect_failed_message (2185803140161396572) -->
     <skip />
-    <!-- no translation found for wifi_advanced_titlebar (1627063574532930090) -->
+    <!-- no translation found for wifi_advanced_titlebar (4485841401774142908) -->
     <skip />
-    <!-- no translation found for wifi_setting_frequency_band_title (7493768705046080060) -->
+    <!-- no translation found for wifi_setting_frequency_band_title (3655327399028584656) -->
     <skip />
     <!-- no translation found for wifi_setting_frequency_band_summary (3250740757118009784) -->
     <skip />
@@ -959,7 +995,7 @@
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <!-- no translation found for wifi_network_prefix_length (3028785234245085998) -->
     <skip />
-    <!-- no translation found for wifi_p2p_settings_title (400503541488064638) -->
+    <!-- no translation found for wifi_p2p_settings_title (5444461191435291082) -->
     <skip />
     <!-- no translation found for wifi_p2p_device_info (3191876744469364173) -->
     <skip />
@@ -991,16 +1027,19 @@
     <skip />
     <!-- no translation found for wifi_p2p_delete_group_message (834559380069647086) -->
     <skip />
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
+    <!-- no translation found for wifi_tether_checkbox_text (1847167643625779136) -->
+    <skip />
     <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
     <skip />
     <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
     <skip />
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errur en connex cun il punct d\'access WLAN mobil"</string>
-    <!-- no translation found for wifi_tether_configure_ap_text (61237027772641155) -->
+    <!-- no translation found for wifi_tether_failed_subtext (1484941858530919002) -->
     <skip />
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <!-- no translation found for wifi_tether_configure_ap_text (7974681394041609308) -->
+    <skip />
+    <!-- no translation found for wifi_tether_configure_subtext (7957547035983257748) -->
+    <skip />
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Visur"</string>
     <!-- no translation found for sound_settings (5534671337768745343) -->
@@ -1195,7 +1234,8 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Intensitad dal signal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Rait"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adressa WLAN-MAC"</string>
+    <!-- no translation found for status_wifi_mac_address (2202206684020765378) -->
+    <skip />
     <string name="status_bt_address" msgid="4195174192087439720">"Adressa Bluetooth"</string>
     <!-- no translation found for status_serial_number (2257111183374628137) -->
     <skip />
@@ -1335,6 +1375,10 @@
     <skip />
     <!-- no translation found for bearer (594270280031923558) -->
     <skip />
+    <!-- no translation found for mvno_type (2543253857818336421) -->
+    <skip />
+    <!-- no translation found for mvno_match_data (4560671695220540466) -->
+    <skip />
     <string name="menu_delete" msgid="6981294422841124659">"Stizzar APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nov APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Memorisar"</string>
@@ -1453,11 +1497,11 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Agid"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Raits mobilas"</string>
     <string name="location_title" msgid="1029961368397484576">"Mes lieu"</string>
-    <!-- no translation found for location_network_based (7472814266821714527) -->
+    <!-- no translation found for location_network_based (9134175479520582215) -->
     <skip />
     <!-- no translation found for location_neighborhood_level (5626515380188353712) -->
     <skip />
-    <!-- no translation found for location_neighborhood_level_wifi (7457348712272184793) -->
+    <!-- no translation found for location_neighborhood_level_wifi (4234820941954812210) -->
     <skip />
     <!-- no translation found for location_gps (8392461023569708478) -->
     <skip />
@@ -1639,6 +1683,8 @@
     <!-- no translation found for filter_dlg_title (8693024463731076091) -->
     <skip />
     <string name="filter_apps_all" msgid="5142129378749391876">"Tuttas"</string>
+    <!-- no translation found for filter_apps_disabled (5364447573326472890) -->
+    <skip />
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Telechargià"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Vegn exequì"</string>
     <!-- no translation found for filter_apps_onsdcard (4843063154701023349) -->
@@ -1740,6 +1786,12 @@
     <skip />
     <!-- no translation found for app_disable_notifications_dlg_text (5088484670924769845) -->
     <skip />
+    <!-- no translation found for app_ops_settings (5108481883575527511) -->
+    <skip />
+    <!-- no translation found for app_ops_running (7706949900637284122) -->
+    <skip />
+    <!-- no translation found for app_ops_never_used (9114608022906887802) -->
+    <skip />
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilisaziun da la memoria"</string>
     <!-- no translation found for storageuse_settings_summary (3748286507165697834) -->
     <skip />
@@ -1866,6 +1918,10 @@
     <skip />
     <!-- no translation found for user_dict_settings_add_locale_option_name (5696358317061318532) -->
     <skip />
+    <!-- no translation found for user_dict_settings_add_word_hint (5725254076556821247) -->
+    <skip />
+    <!-- no translation found for user_dict_settings_add_shortcut_hint (7333763456561873445) -->
+    <skip />
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifitgar il pled"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifitgar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Stizzar"</string>
@@ -1928,8 +1984,12 @@
     <skip />
     <!-- no translation found for development_settings_summary (1815795401632854041) -->
     <skip />
+    <!-- no translation found for development_settings_not_available (4308569041701535607) -->
+    <skip />
     <string name="enable_adb" msgid="7982306934419797485">"Debugar USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modus da debugar sch\'in apparat periferic USB è connectà"</string>
+    <!-- no translation found for clear_adb_keys (4038889221503122743) -->
+    <skip />
     <!-- no translation found for bugreport_in_power (4548816486587403971) -->
     <skip />
     <!-- no translation found for bugreport_in_power_summary (5764234382355067053) -->
@@ -1941,6 +2001,8 @@
     <string name="adb_warning_title" msgid="6234463310896563253">"Permetter da debugar USB?"</string>
     <!-- no translation found for adb_warning_message (7316799925425402244) -->
     <skip />
+    <!-- no translation found for adb_keys_warning_message (6932230298032192937) -->
+    <skip />
     <!-- no translation found for dev_settings_warning_title (7244607768088540165) -->
     <skip />
     <!-- no translation found for dev_settings_warning_message (2298337781139097964) -->
@@ -2016,31 +2078,23 @@
     <skip />
     <!-- no translation found for accessibility_long_press_timeout_preference_title (6708467774619266508) -->
     <skip />
-    <!-- no translation found for accessibility_toggle_script_injection_preference_title (7950932054266694403) -->
-    <skip />
     <!-- no translation found for accessibility_menu_item_settings (3344942964710773365) -->
     <skip />
     <!-- no translation found for accessibility_feature_state_on (2864292320042673806) -->
     <skip />
     <!-- no translation found for accessibility_feature_state_off (4172584906487070211) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_allowed (7624804397748427621) -->
+    <!-- no translation found for enable_service_title (3061307612673835592) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_disallowed (8639525487720429182) -->
+    <!-- no translation found for capabilities_list_title (86713361724771971) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_button_allow (2201503285877102870) -->
+    <!-- no translation found for capability_title_receiveAccessibilityEvents (1869032063969970755) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_button_disallow (5697152768523270885) -->
+    <!-- no translation found for capability_desc_receiveAccessibilityEvents (2095111008854376237) -->
     <skip />
-    <!-- no translation found for accessibility_service_security_warning_title (5421628151509995404) -->
+    <!-- no translation found for disable_service_title (3624005212728512896) -->
     <skip />
-    <!-- no translation found for accessibility_service_security_warning_summary (8558441850832543571) -->
-    <skip />
-    <!-- no translation found for accessibility_service_security_warning_summary (2869015914319424723) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning_title (3393956845814484859) -->
-    <skip />
-    <!-- no translation found for accessibility_service_disable_warning_summary (625013894287895398) -->
+    <!-- no translation found for disable_service_message (2012273739481042318) -->
     <skip />
     <!-- no translation found for accessibility_no_services_installed (7200948194639038807) -->
     <skip />
@@ -2048,8 +2102,6 @@
     <skip />
     <!-- no translation found for accessibility_service_no_apps_message (7751662416377046539) -->
     <skip />
-    <!-- no translation found for accessibility_script_injection_security_warning_summary (7706858873495386310) -->
-    <skip />
     <!-- no translation found for accessibility_service_default_description (1072730037861494125) -->
     <skip />
     <!-- no translation found for settings_button (3006713718908152930) -->
@@ -2068,7 +2120,7 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Vegn chargià"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Visur activà"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activà"</string>
-    <!-- no translation found for battery_stats_wifi_running_label (3093545080361658269) -->
+    <!-- no translation found for battery_stats_wifi_running_label (1845839195549226252) -->
     <skip />
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Alert"</string>
     <!-- no translation found for battery_stats_phone_signal_label (4137799310329041341) -->
@@ -2076,9 +2128,9 @@
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Temp d\'activitad da l\'apparat"</string>
-    <!-- no translation found for wifi_on_time (6310209835617490616) -->
+    <!-- no translation found for wifi_on_time (3208518458663637035) -->
     <skip />
-    <!-- no translation found for bluetooth_on_time (6157799524996162271) -->
+    <!-- no translation found for bluetooth_on_time (3056108148042308690) -->
     <skip />
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <!-- no translation found for history_details_title (3608240585315506067) -->
@@ -2090,7 +2142,8 @@
     <string name="packages_subtitle" msgid="4736416171658062768">"Pachets inclus"</string>
     <!-- no translation found for power_screen (3023346080675904613) -->
     <skip />
-    <string name="power_wifi" msgid="2382791137776486974">"WLAN"</string>
+    <!-- no translation found for power_wifi (1135085252964054957) -->
+    <skip />
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Standby telefonin"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cloms vocals"</string>
@@ -2101,7 +2154,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU - Fund davant"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Betg sa durmentar"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <!-- no translation found for usage_type_wifi_running (8234997940652067049) -->
+    <!-- no translation found for usage_type_wifi_running (3134357198266380400) -->
     <skip />
     <!-- no translation found for usage_type_phone (262638572890253393) -->
     <skip />
@@ -2119,7 +2172,7 @@
     <skip />
     <!-- no translation found for battery_action_display (7338551244519110831) -->
     <skip />
-    <!-- no translation found for battery_action_wifi (2272741639606146903) -->
+    <!-- no translation found for battery_action_wifi (8181553479021841207) -->
     <skip />
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Parameters Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Accu utilisà per cloms"</string>
@@ -2130,8 +2183,9 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Midai al modus d\'aviun per spargnar accu en lieus senza access a la rait"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"La consumaziun d\'accu entras il visur e la glisch"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reducir la clerezza e/u il timeout dal visur"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Accu utilisà da WLAN"</string>
-    <!-- no translation found for battery_sugg_wifi (2085605314976704287) -->
+    <!-- no translation found for battery_desc_wifi (2375567464707394131) -->
+    <skip />
+    <!-- no translation found for battery_sugg_wifi (3355461362094706957) -->
     <skip />
     <!-- no translation found for battery_desc_bluetooth (8069070756186680367) -->
     <skip />
@@ -2193,6 +2247,8 @@
     <!-- no translation found for tts_engine_error_reselect (2415399149293842112) -->
     <skip />
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Quest modul da sintesa vocala è capabel da memorisar l\'entir text discurrì inclus datas persunalas sco pleds-clav e numers da cartas da credit. El deriva da l\'applicaziun <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Vulais Vus activar quest modul?"</string>
+    <!-- no translation found for tts_engine_network_required (1190837151485314743) -->
+    <skip />
     <string name="tts_engines_section" msgid="7515470972378742429">"Moduls"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Parameters <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> è activà."</string>
@@ -2217,7 +2273,8 @@
     <skip />
     <!-- no translation found for gadget_title (5519037532720577836) -->
     <skip />
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Actualisar ils parameters WLAN"</string>
+    <!-- no translation found for gadget_toggle_wifi (319262861956544493) -->
+    <skip />
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualisaziun dals parameters bluetooth"</string>
     <!-- no translation found for gadget_state_template (5156935629902649932) -->
     <skip />
@@ -2229,7 +2286,7 @@
     <skip />
     <!-- no translation found for gadget_state_turning_off (2395546048102176157) -->
     <skip />
-    <!-- no translation found for gadget_wifi (5960290421313061434) -->
+    <!-- no translation found for gadget_wifi (4712584536500629417) -->
     <skip />
     <!-- no translation found for gadget_bluetooth (8998572807378694410) -->
     <skip />
@@ -2267,6 +2324,12 @@
     <skip />
     <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
     <skip />
+    <!-- no translation found for credential_storage_type (8629968543494001364) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
+    <skip />
+    <!-- no translation found for credential_storage_type_software (4403117271207715378) -->
+    <skip />
     <!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
     <skip />
     <!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
@@ -2301,7 +2364,7 @@
     <skip />
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datas persunalas"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Far copias da segirezza da mias datas"</string>
-    <!-- no translation found for backup_data_summary (9157861529438245957) -->
+    <!-- no translation found for backup_data_summary (708773323451655666) -->
     <skip />
     <!-- no translation found for backup_configure_account_title (3790872965773196615) -->
     <skip />
@@ -2323,7 +2386,7 @@
     <!-- no translation found for local_backup_password_toast_validation_failure (5646377234895626531) -->
     <skip />
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <!-- no translation found for backup_erase_dialog_message (7218566008912418809) -->
+    <!-- no translation found for backup_erase_dialog_message (5221011285568343155) -->
     <skip />
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Parameters d\'administraziun da l\'apparat"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administratur dad apparats"</string>
@@ -2344,13 +2407,13 @@
     <skip />
     <!-- no translation found for sound_category_system_title (1480844520622721141) -->
     <skip />
-    <!-- no translation found for wifi_setup_title (661074868726906436) -->
+    <!-- no translation found for wifi_setup_title (2970260757780025029) -->
     <skip />
-    <!-- no translation found for wifi_setup_title_editing_network (7304321031985059969) -->
+    <!-- no translation found for wifi_setup_title_editing_network (6020614644556717979) -->
     <skip />
-    <!-- no translation found for wifi_setup_title_connecting_network (3747859666621319757) -->
+    <!-- no translation found for wifi_setup_title_connecting_network (5572226790101017822) -->
     <skip />
-    <!-- no translation found for wifi_setup_title_connected_network (209755856836003839) -->
+    <!-- no translation found for wifi_setup_title_connected_network (1608788657122010919) -->
     <skip />
     <!-- no translation found for wifi_setup_title_add_network (6932651000151032301) -->
     <skip />
@@ -2394,11 +2457,11 @@
     <skip />
     <!-- no translation found for wifi_setup_status_eap_not_supported (5335338851032315905) -->
     <skip />
-    <!-- no translation found for wifi_setup_eap_not_supported (595556546597351489) -->
+    <!-- no translation found for wifi_setup_eap_not_supported (1955087534276570962) -->
     <skip />
     <!-- no translation found for wifi_setup_description_connecting (2793554932006756795) -->
     <skip />
-    <!-- no translation found for wifi_setup_description_connected (5235991893829582459) -->
+    <!-- no translation found for wifi_setup_description_connected (736032046548460779) -->
     <skip />
     <!-- no translation found for accessibility_sync_enabled (558480439730263116) -->
     <skip />
@@ -2530,6 +2593,8 @@
     <skip />
     <!-- no translation found for debug_drawing_category (6755716469267367852) -->
     <skip />
+    <!-- no translation found for debug_hw_drawing_category (6220174216912308658) -->
+    <skip />
     <!-- no translation found for debug_monitoring_category (7640508148375798343) -->
     <skip />
     <!-- no translation found for strict_mode (1938795874357830695) -->
@@ -2564,16 +2629,6 @@
     <skip />
     <!-- no translation found for disable_overlays_summary (3578941133710758592) -->
     <skip />
-    <!-- no translation found for enable_traces_title (7448835465859512430) -->
-    <skip />
-    <!-- no translation found for enable_traces_dialog_title (5026490474669452929) -->
-    <skip />
-    <!-- no translation found for enable_traces_summary_none (1867562808503494163) -->
-    <skip />
-    <!-- no translation found for enable_traces_summary_num (8978230237777454269) -->
-    <skip />
-    <!-- no translation found for enable_traces_summary_all (3950139649125158247) -->
-    <skip />
     <!-- no translation found for enable_opengl_traces_title (6790444011053219871) -->
     <skip />
     <!-- no translation found for debug_layout (5981361776594526155) -->
@@ -2592,9 +2647,9 @@
     <skip />
     <!-- no translation found for force_msaa_summary (9123553203895817537) -->
     <skip />
-    <!-- no translation found for track_frame_time (6146354853663863443) -->
+    <!-- no translation found for show_non_rect_clip (505954950474595172) -->
     <skip />
-    <!-- no translation found for track_frame_time_summary (447577515813970287) -->
+    <!-- no translation found for track_frame_time (6146354853663863443) -->
     <skip />
     <!-- no translation found for window_animation_scale_title (6162587588166114700) -->
     <skip />
@@ -2616,6 +2671,10 @@
     <skip />
     <!-- no translation found for show_all_anrs_summary (641908614413544127) -->
     <skip />
+    <!-- no translation found for experimental_webview (4492200819033780927) -->
+    <skip />
+    <!-- no translation found for experimental_webview_summary (3431620080869482446) -->
+    <skip />
     <!-- no translation found for data_usage_summary_title (3804110657238092929) -->
     <skip />
     <!-- no translation found for data_usage_cycle (5652529796195787949) -->
@@ -2626,7 +2685,7 @@
     <skip />
     <!-- no translation found for data_usage_menu_split_4g (5322857680792601899) -->
     <skip />
-    <!-- no translation found for data_usage_menu_show_wifi (8266875319417201085) -->
+    <!-- no translation found for data_usage_menu_show_wifi (5056401102877964564) -->
     <skip />
     <!-- no translation found for data_usage_menu_show_ethernet (5181361208532314097) -->
     <skip />
@@ -2654,9 +2713,9 @@
     <skip />
     <!-- no translation found for data_usage_disable_3g_limit (2558557840444266906) -->
     <skip />
-    <!-- no translation found for data_usage_disable_wifi_limit (8575537650560665657) -->
+    <!-- no translation found for data_usage_disable_wifi_limit (1394901415264660888) -->
     <skip />
-    <!-- no translation found for data_usage_tab_wifi (1728851922959017766) -->
+    <!-- no translation found for data_usage_tab_wifi (481146038146585749) -->
     <skip />
     <!-- no translation found for data_usage_tab_ethernet (7298064366282319911) -->
     <skip />
@@ -2718,11 +2777,11 @@
     <skip />
     <!-- no translation found for data_usage_restrict_background_title (2201315502223035062) -->
     <skip />
-    <!-- no translation found for data_usage_restrict_background (6387252645350792955) -->
+    <!-- no translation found for data_usage_restrict_background (8447934953579275363) -->
     <skip />
-    <!-- no translation found for data_usage_restrict_background_multiuser (2609163428726042269) -->
+    <!-- no translation found for data_usage_restrict_background_multiuser (7132639594296036143) -->
     <skip />
-    <!-- no translation found for data_usage_restrict_background_multiuser (8025473178302056174) -->
+    <!-- no translation found for data_usage_restrict_background_multiuser (2642864376010074543) -->
     <skip />
     <!-- no translation found for data_usage_sweep_warning (6387081852568846982) -->
     <skip />
@@ -2742,13 +2801,13 @@
     <skip />
     <!-- no translation found for data_usage_metered_title (6204750602856383278) -->
     <skip />
-    <!-- no translation found for data_usage_metered_body (2446827764036316131) -->
+    <!-- no translation found for data_usage_metered_body (4959032833706695848) -->
     <skip />
     <!-- no translation found for data_usage_metered_mobile (5423305619126978393) -->
     <skip />
-    <!-- no translation found for data_usage_metered_wifi (4151511616349458705) -->
+    <!-- no translation found for data_usage_metered_wifi (8540872226614404873) -->
     <skip />
-    <!-- no translation found for data_usage_metered_wifi_disabled (7566012564261138417) -->
+    <!-- no translation found for data_usage_metered_wifi_disabled (5502020778468643732) -->
     <skip />
     <!-- no translation found for cryptkeeper_emergency_call (198578731586097145) -->
     <skip />
@@ -2863,25 +2922,39 @@
     <skip />
     <!-- no translation found for user_settings_title (6151874007858148344) -->
     <skip />
-    <!-- no translation found for user_you_section (6247838798859425408) -->
+    <!-- no translation found for user_list_title (7937158411137563543) -->
     <skip />
-    <!-- no translation found for user_list_title (8866161687358773982) -->
+    <!-- no translation found for user_add_user_menu (3154537325132012954) -->
     <skip />
-    <!-- no translation found for user_add_user_menu (1675956975014862382) -->
+    <!-- no translation found for user_summary_restricted_profile (6354966213806839107) -->
     <skip />
-    <!-- no translation found for user_summary_active (4740649452346004418) -->
+    <!-- no translation found for user_need_lock_message (2596365678651842785) -->
     <skip />
-    <!-- no translation found for user_summary_inactive (3758296246095054572) -->
+    <!-- no translation found for user_set_lock_button (8311219392856626841) -->
     <skip />
     <!-- no translation found for user_summary_not_set_up (8778205026866794909) -->
     <skip />
+    <!-- no translation found for user_summary_restricted_not_set_up (1628116001964325544) -->
+    <skip />
     <!-- no translation found for user_owner (3879126011135546571) -->
     <skip />
+    <!-- no translation found for user_you (1639158809315025986) -->
+    <skip />
     <!-- no translation found for user_nickname (5148818000228994488) -->
     <skip />
+    <!-- no translation found for user_add_user_type_title (2146438670792322349) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_summary (4702776187132008661) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_summary (5931663986889138941) -->
+    <skip />
+    <!-- no translation found for user_add_user_item_title (8212199632466198969) -->
+    <skip />
+    <!-- no translation found for user_add_profile_item_title (8353515490730363621) -->
+    <skip />
     <!-- no translation found for user_add_user_title (3961861593718285403) -->
     <skip />
-    <!-- no translation found for user_add_user_message_long (2278524063301283723) -->
+    <!-- no translation found for user_add_user_message_long (3086244205384741788) -->
     <skip />
     <!-- no translation found for user_add_user_message_short (3310933423737035428) -->
     <skip />
@@ -2889,6 +2962,8 @@
     <skip />
     <!-- no translation found for user_setup_dialog_message (614037943337008555) -->
     <skip />
+    <!-- no translation found for user_setup_profile_dialog_message (3896568553327558731) -->
+    <skip />
     <!-- no translation found for user_setup_button_setup_now (3391388430158437629) -->
     <skip />
     <!-- no translation found for user_setup_button_setup_later (3068729597269172401) -->
@@ -2897,14 +2972,20 @@
     <skip />
     <!-- no translation found for user_cannot_manage_message (1133251987818014757) -->
     <skip />
+    <!-- no translation found for user_cannot_add_accounts_message (5116692653439737050) -->
+    <skip />
     <!-- no translation found for user_remove_user_menu (6897150520686691355) -->
     <skip />
     <!-- no translation found for user_new_user_name (369856859816028856) -->
     <skip />
+    <!-- no translation found for user_new_profile_name (2632088404952119900) -->
+    <skip />
     <!-- no translation found for user_confirm_remove_self_title (8432050170899479556) -->
     <skip />
     <!-- no translation found for user_confirm_remove_title (3856148232937245711) -->
     <skip />
+    <!-- no translation found for user_profile_confirm_remove_title (7399928935979459016) -->
+    <skip />
     <!-- no translation found for user_confirm_remove_self_message (8167855311779740207) -->
     <skip />
     <!-- no translation found for user_confirm_remove_self_message (5391888073786090274) -->
@@ -2913,12 +2994,22 @@
     <skip />
     <!-- no translation found for user_confirm_remove_message (8130264611683731142) -->
     <skip />
+    <!-- no translation found for user_profile_confirm_remove_message (3071489858733409187) -->
+    <skip />
+    <!-- no translation found for user_profile_confirm_remove_message (7078238859138335893) -->
+    <skip />
     <!-- no translation found for user_adding_new_user (1521674650874241407) -->
     <skip />
     <!-- no translation found for user_delete_user_description (3158592592118767056) -->
     <skip />
     <!-- no translation found for user_delete_button (5131259553799403201) -->
     <skip />
+    <!-- no translation found for application_restrictions (8207332020898004394) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_header (3660449891478534440) -->
+    <skip />
+    <!-- no translation found for apps_with_restrictions_settings_button (3841347287916635821) -->
+    <skip />
     <!-- no translation found for global_change_warning (8045013389464294039) -->
     <skip />
     <!-- no translation found for global_change_warning (2461264421590324675) -->
@@ -2939,4 +3030,45 @@
     <skip />
     <!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
     <skip />
+    <!-- no translation found for user_restrictions_title (7745810037152772035) -->
+    <skip />
+    <!-- no translation found for user_rename (8523499513614655279) -->
+    <skip />
+    <!-- no translation found for app_restrictions_custom_label (4171895848817279538) -->
+    <skip />
+    <!-- no translation found for user_restrictions_controlled_by (3164078767438313899) -->
+    <skip />
+    <!-- no translation found for app_not_supported_in_limited (913035259626149121) -->
+    <skip />
+    <!-- no translation found for app_sees_restricted_accounts (7503264525057246240) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_title (8889556384136994814) -->
+    <skip />
+    <!-- no translation found for restriction_wifi_config_summary (70888791513065244) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_title (8871681580962503671) -->
+    <skip />
+    <!-- no translation found for restriction_bluetooth_config_summary (8372319681287562506) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_title (5888100955212267941) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (3891097373396149915) -->
+    <skip />
+    <!-- no translation found for restriction_nfc_enable_summary (825331120501418592) -->
+    <skip />
+    <!-- no translation found for restriction_location_enable_title (8134436816263688497) -->
+    <skip />
+    <!-- no translation found for restriction_location_enable_summary (3489765572281788755) -->
+    <skip />
+    <!-- no translation found for wizard_back (5567007959434765743) -->
+    <skip />
+    <!-- no translation found for wizard_next (3606212602795100640) -->
+    <skip />
+    <!-- no translation found for wizard_finish (3286109692700083252) -->
+    <skip />
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Far ina foto"</string>
+    <!-- no translation found for user_image_choose_photo (7940990613897477057) -->
+    <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
+    <skip />
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index f208e5e..3d909a8 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Încet"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Rapid"</item>
-    <item msgid="2538100882620724753">"Foarte rapid"</item>
+    <item msgid="1370673569131070146">"Mai repede"</item>
+    <item msgid="4648206845228970803">"Foarte repede"</item>
+    <item msgid="4977949754169483251">"Rapid"</item>
+    <item msgid="6106302964845503577">"Foarte rapid"</item>
+    <item msgid="6800277205640837264">"Cel mai repede"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Foarte scăzut"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Niciuna"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Niciunul"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Nespecificat"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Niciuna"</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">"Stocare internă pe dispozitiv"</item>
     <item msgid="3738430123799803530">"Card SD detaşabil"</item>
     <item msgid="4498124044785815005">"Permiteţi sistemului să decidă"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Locație"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Mesagerie"</item>
+    <item msgid="8971765125227378270">"Gadget"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"locație imprecisă"</item>
+    <item msgid="5789673140227507995">"locație exactă"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrează"</item>
+    <item msgid="3434165993711230924">"citește agenda"</item>
+    <item msgid="616161687718081936">"modifică agenda"</item>
+    <item msgid="7638002295329050091">"citește jurnalul de apeluri"</item>
+    <item msgid="6546959730920410907">"modifică jurnalul de apeluri"</item>
+    <item msgid="446877710771379667">"citește calendarul"</item>
+    <item msgid="7674458294386319722">"modifică calendarul"</item>
+    <item msgid="8281201165558093009">"scanează Wi-Fi"</item>
+    <item msgid="8694611243479480497">"notificare"</item>
+    <item msgid="7776439107987345446">"scanează semnal mobil"</item>
+    <item msgid="514615766544675057">"apelează un telefon"</item>
+    <item msgid="8181415497109310680">"citește mesaje SMS"</item>
+    <item msgid="6816551144382117307">"scrie mesaje SMS"</item>
+    <item msgid="4600463921908905030">"primește mesaje SMS"</item>
+    <item msgid="5958926493289432745">"primește mesaje SMS de urgență"</item>
+    <item msgid="4945269495221089540">"primește mesaje MMS"</item>
+    <item msgid="5570472453573929087">"primește mesaje WAP push"</item>
+    <item msgid="7125408150230860501">"trimite mesaje SMS"</item>
+    <item msgid="7080337936612188061">"citește mesaje ICC SMS"</item>
+    <item msgid="587124103118495063">"scrie mesaje ICC SMS"</item>
+    <item msgid="2320577158869025503">"modifică setările"</item>
+    <item msgid="1545733463471924009">"desenează deasupra"</item>
+    <item msgid="3609046903962454582">"accesează notificări"</item>
+    <item msgid="4671646036128214513">"cameră foto"</item>
+    <item msgid="1097324338692486211">"înregistrează conținut audio"</item>
+    <item msgid="5031552983987798163">"redă conținut audio"</item>
+    <item msgid="8374996688066472414">"citește clipboardul"</item>
+    <item msgid="3045529469061083747">"modifică clipboardul"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Locație"</item>
+    <item msgid="8677040780775113033">"Locație"</item>
+    <item msgid="1660743989948992916">"Locație"</item>
+    <item msgid="8791172739860195290">"Vibrează"</item>
+    <item msgid="383413555642128046">"Citește agenda"</item>
+    <item msgid="3654594895269697313">"Modifică agenda"</item>
+    <item msgid="7928393476362362538">"Citește jurnalul de apeluri"</item>
+    <item msgid="6248591205254641116">"Modifică jurnalul de apeluri"</item>
+    <item msgid="6093344633066170692">"Citește calendarul"</item>
+    <item msgid="1334886368750347692">"Modifică calendarul"</item>
+    <item msgid="1638204101698708656">"Locație"</item>
+    <item msgid="2154671955760380322">"Postează o notificare"</item>
+    <item msgid="4282477730595931828">"Locație"</item>
+    <item msgid="4891423912898525905">"Apelează un telefon"</item>
+    <item msgid="626463821668200388">"Primește mesaje SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Trimite mesaje SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Primește mesaje SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Primește mesaje SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Primește mesaje SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Primește mesaje SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Trimite mesaje SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Primește mesaje SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Trimite mesaje SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Modifică setările"</item>
+    <item msgid="736541391767350377">"Desenează deasupra"</item>
+    <item msgid="5530815681721654194">"Accesează notificări"</item>
+    <item msgid="781213371706962767">"Cameră foto"</item>
+    <item msgid="1720492593061838172">"Înregistrează conținut audio"</item>
+    <item msgid="3493046322001257041">"Redă conținut audio"</item>
+    <item msgid="136815868796597058">"Citește clipboardul"</item>
+    <item msgid="5238692940326972503">"Modifică clipboardul"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Scurtă"</item>
     <item msgid="2560532955514699713">"Medie"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (imagini)"</item>
     <item msgid="1340692776955662664">"Apelaţi stiva pentru glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Dezactivat"</item>
+    <item msgid="675719912558941285">"Zonă decupare non-rectangulară albastră"</item>
+    <item msgid="1064373276095698656">"Controale de desenare testate, cu verde"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Dezactivat"</item>
+    <item msgid="2751513398307949636">"Pe ecran ca bare"</item>
+    <item msgid="8272260411216018353">"Pe ecran ca linii"</item>
+    <item msgid="120512413928262547">"În adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Limita standard"</item>
     <item msgid="4071574792028999443">"Nu există procese de fundal"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index dfd4348..e0c066e 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -28,7 +28,7 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Aţi devenit dezvoltator!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteţi deja dezvoltator."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ŞI REŢELE"</string>
+    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ȘI REŢELE"</string>
     <string name="header_category_device" msgid="5781174212691167553">"DISPOZITIV"</string>
     <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
     <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
@@ -66,8 +66,8 @@
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"Demontaţi stocarea USB"</string>
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"Demontaţi cardul SD"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ştergeţi stocarea USB"</string>
-    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ştergeţi cardul SD"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Ștergeţi stocarea USB"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"Ștergeţi cardul SD"</string>
     <string name="small_font" msgid="2295331917424072635">"Mică"</string>
     <string name="medium_font" msgid="2068475425515133701">"Medie"</string>
     <string name="large_font" msgid="599055175160971446">"Mare"</string>
@@ -179,7 +179,7 @@
     <string name="intent_sender_resource_label" msgid="6963659726895482829">"<xliff:g id="RESOURCE">Resource</xliff:g>:"</string>
     <string name="intent_sender_account_label" msgid="465210404475603404">"Cont:"</string>
     <string name="proxy_settings_title" msgid="5912878565897294401">"Setări proxy"</string>
-    <string name="proxy_clear_text" msgid="5555400754952012657">"Ştergeţi"</string>
+    <string name="proxy_clear_text" msgid="5555400754952012657">"Ștergeţi"</string>
     <string name="proxy_port_label" msgid="5655276502233453400">"Port proxy"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Evitaţi utilizarea unui proxy pentru"</string>
     <string name="proxy_exclusionlist_hint" msgid="6084099226687226948">"example.com,mycomp.test.com,localhost"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Mod Avion"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mai multe..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless şi reţele"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Gestionaţi reţelele Wi-Fi, funcţia Bluetooth, modul Avion, reţelele mobile şi reţelele VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Gestionați rețelele Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și rețelele VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de date"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Conectaţi-vă la servicii de date în roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Conectaţi-vă la serviciile de date în roaming"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduceţi textul de afişat pe ecranul de blocare"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Informații utilizator pe ecranul de blocare"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Info. utilizator"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afișați informații profil la blocarea ecranului"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informații profil"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Acces la locaţie"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Administrarea dispozitivelor"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Administratori dispozitiv"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afişaţi sau dezactivaţi administratorii dispozitivului"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activaţi funcţia Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Reţineţi setările"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Ecran wireless"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Pentru a vedea gadgeturi, activați ecranul wireless."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Ecranul wireless este dezactivat, deoarece reţeaua Wi-Fi este oprită."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Ecranul wireless este dezactivat, deoarece rețeaua Wi-Fi este oprită."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Căutaţi afişaje"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Se caută…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Nu există afişaje wireless în apropiere."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"După activarea acestei funcţii, puteţi transmite conţinutul aplicaţiilor către un alt dispozitiv compatibil NFC, ţinând cele două dispozitive apropiate unul de celălalt. De exemplu, puteţi să transmiteţi pagini din browser, videoclipuri YouTube, persoane din agendă şi multe altele."\n\n"Nu trebuie decât să apropiaţi cele două dispozitive (de obicei, aşezându-le unul în spatele celuilalt) şi să atingeţi ecranul. Aplicaţia determină apoi ce poate fi transmis."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Descoperire serviciu de reţea"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Permite aplicaţiilor de pe alte dispozitive să descopere aplicaţii pe acest dispozitiv"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Activaţi Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Setări Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activați conexiunea Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Setări Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Configuraţi şi gestionaţi punctele de acces wireless"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Selectaţi o reţea Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Se activează Wi-Fi?"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Se dezactivează Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Selectați o rețea Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Se activează Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Se dezactivează Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Eroare"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"În modul Avion"</string>
     <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nu se poate scana pentru reţele"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Notificare de reţea"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Doresc să fiu notificat când este disponibilă o reţea deschisă"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitaţi conexiunile slabe"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"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_setting_sleep_policy_title" msgid="9107237003911220057">"Menţineţi Wi-Fi activat în modul inactiv"</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_scan_always_available" msgid="3470564139944368030">"Scanare mereu disponibilă"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Permiteți serviciului de localizare Google și altor aplicații să caute rețele, chiar dacă rețeaua Wi-Fi este dezactivată"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instalați certificate"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Pentru a îmbunătăți precizia locației, dar și în alte scopuri, Google și alte aplicații pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplicațiile pot căuta rețele în apropiere, chiar dacă rețeaua Wi-Fi este dezactivată. Dacă nu doriți acest lucru, accesați Avansate &gt; Scanare mereu disponibilă."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Nu mai afișa"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Mențineți Wi-Fi activat în modul inactiv"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"A apărut o problemă la modificarea setării"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimizare Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Reduceţi la minimum utilizarea bateriei când reţeaua Wi-Fi este pornită"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizare Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Reduceți la minimum utilizarea bateriei când rețeaua Wi-Fi este activată"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Adăugaţi o reţea"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Reţele Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Rețele Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Buton WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Mai multe opţiuni"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introduceţi PIN WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Conectaţi-vă la reţea"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Eliminaţi reţeaua"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificaţi reţeaua"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Pt. a vedea reţelele disponibile, activaţi Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Se caută reţele Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Vedeți rețelele disponibile activând Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Se caută rețele Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nu aveți permisiunea să modificați rețeaua Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Altă reţea…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mai multe"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Config. automată (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Pentru a finaliza configurarea, este necesar ca tableta să aibă acces la Wi-Fi. După configurare, puteţi opta să utilizaţi datele mobile sau Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Pentru a finaliza configurarea, este necesar ca tableta să aibă acces la Wi-Fi. După configurare, puteți opta să utilizați datele mobile sau Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Afişaţi opţiunile avansate"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configurare protejată Wi-Fi"</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="7204827509934892103">"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_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Conectat la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Conectat la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS este deja în desfăşurare. Finalizarea poate dura până la două minute."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS eşuată. Încercaţi din nou peste câteva minute."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Setarea de securitate pentru routerul wireless (WEP) nu este acceptată"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentificare eşuată. Încercaţi din nou."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"A fost detectată altă sesiune WPS. Încercaţi din nou peste câteva minute."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID reţea"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Introduceți identificatorul SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Securitatea"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Putere semnal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stare"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Permiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Respingeți"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Conectaţi-vă"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nu s-a putut stabili conexiunea la reţea"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Eliminaţi"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nu ignoraţi"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator."\n\n"Configurarea tabletei poate presupune o activitate semnificativă în reţea."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"AVERTISMENT: puteţi acumula costuri suplimentare pentru date de la operator."\n\n"Configurarea telefonului poate presupune o activitate semnificativă în reţea."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"AVERTISMENT: tableta nu va putea să verifice dacă software-ul este actualizat."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"AVERTISMENT: telefonul nu va putea să verifice dacă software-ul este actualizat."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tableta nu s-a putut conecta la această reţea Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefonul nu s-a putut conecta la această reţea Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Setări Wi-Fi avansate"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bandă de frecvenţă Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"AVERTISMENT: tableta nu va putea verifica actualizarea software-ului decât după ce aveți o conexiune de internet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"AVERTISMENT: telefonul nu va putea verifica actualizarea software-ului decât după ce aveți o conexiune de internet."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tableta nu s-a putut conecta la această rețea Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefonul nu s-a putut conecta la această rețea Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Setări Wi-Fi avansate"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Bandă de frecvență Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Indicaţi intervalul de frecvenţă al operaţiei"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"A apărut o probl. la setarea benzii de frecvenţă."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresă MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Lungime prefix reţea"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informaţii dispozitiv"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Reţineţi această conexiune"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Căutaţi dispozitive"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulaţi invitaţia?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriţi să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Eliminaţi acest grup?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Hotspot Wi-Fi portabil"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Eroare de hotspot Wi-Fi portabil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configuraţi hotspotul Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"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_failed_subtext" msgid="1484941858530919002">"Eroare de hotspot Wi-Fi portabil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurați hotspotul Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Afişare"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
@@ -666,7 +688,7 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sunet de notificare prestabilit"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos de notificare prin pulsaţie"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos intermitent"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificare"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizaţi volumul apelurilor de intrare pentru notificări"</string>
@@ -675,7 +697,7 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Setaţi volumul pentru muzică şi videoclipuri"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarmă"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Setări audio pentru dispozitivul de andocare ataşat"</string>
-    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonuri la atingerea tastaturii pentru apelare"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tonuri atingere taste"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Sunete la atingere"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sunet de blocare a ecranului"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Vibrare la atingere"</string>
@@ -719,7 +741,7 @@
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Alege o imagine din"</string>
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Daydream"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"În ambele situații"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Putere semnal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Reţea"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresă MAC Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresă MAC Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresă Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Număr de serie"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Indisponibilă"</string>
@@ -803,7 +825,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Disponibil (numai în citire)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Spaţiu total"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Se calculează..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaţii (date aplicaţii şi conţinut media)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicații (date și conținut media)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Descărcări"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Imagini, videoclipuri"</string>
@@ -820,11 +842,11 @@
     <string name="sd_mount" product="default" msgid="5940523765187704135">"Montaţi cardul SD"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Ştergeţi stocarea USB"</string>
-    <string name="sd_format" product="default" msgid="2576054280507119870">"Ştergeţi cardul SD"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Şterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
-    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Şterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ştergeţi datele memorate în cache?"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Ștergeţi stocarea USB"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"Ștergeţi cardul SD"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Șterge toate datele din stocarea USB internă, cum ar fi muzica şi fotografiile"</string>
+    <string name="sd_format_summary" product="default" msgid="212703692181793109">"Șterge toate datele de pe cardul SD, cum ar fi muzica şi fotografiile"</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ștergeţi datele memorate în cache?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"Datele din cache ale aplicaţiilor vor fi şterse."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Funcţia MTP sau PTP este activă"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Demontaţi stocarea USB?"</string>
@@ -879,7 +901,9 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN activat"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN dezactivat"</string>
     <string name="bearer" msgid="594270280031923558">"Purtător"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"Ştergeţi APN"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Tip MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Valoare MVNO"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"Ștergeţi APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN nou"</string>
     <string name="menu_save" msgid="8109345640668285399">"Salvaţi"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Renunţaţi"</string>
@@ -892,37 +916,37 @@
     <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="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_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>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muzică"</li>\n<li>"Fotografii"</li>\n<li>"Alte date ale utilizatorului"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ştearsă."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Pentru a şterge muzică, imagini şi alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie şters."</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ştergeţi stocarea USB"</string>
-    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ştergeţi cardul SD"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ştergeţi toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ştergeţi toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Ștergeţi stocarea USB"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Ștergeţi cardul SD"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Ștergeţi toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Ștergeţi toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Resetaţi tableta"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Resetaţi telefonul"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ştergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
-    <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ştergeţi tot"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ștergeţi toate informaţiile personale şi aplicaţiile descărcate? Nu puteţi anula această acţiune!"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"Ștergeţi tot"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Desenaţi modelul pentru deblocare"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Trebuie să desenaţi modelul de deblocare pentru a confirma resetarea configurării din fabrică."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Resetaţi?"</string>
-    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ştergeţi stocarea USB"</string>
-    <string name="media_format_title" product="default" msgid="4427528440306787972">"Ştergeţi cardul SD"</string>
-    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Şterge datele din stocarea USB"</string>
-    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Ştergeţi toate datele de pe cardul SD"</string>
-    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Ştergeţi integral stocarea USB? Veţi pierde "<b>"toate"</b>" datele stocate!"</string>
-    <string name="media_format_desc" product="default" msgid="8764037252319942415">"Ştergeţi cardul SD? Veţi pierde "<b>"toate"</b>" datele de pe card!"</string>
-    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Ştergeţi stocarea USB"</string>
-    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Ştergeţi cardul SD"</string>
-    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ştergeţi stocarea USB şi toate fişierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
-    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ştergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
-    <string name="media_format_final_button_text" msgid="4881713344315923175">"Ştergeţi tot"</string>
+    <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Ștergeţi stocarea USB"</string>
+    <string name="media_format_title" product="default" msgid="4427528440306787972">"Ștergeţi cardul SD"</string>
+    <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Șterge datele din stocarea USB"</string>
+    <string name="media_format_summary" product="default" msgid="3805714639375830120">"Ștergeţi toate datele de pe cardul SD"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Ștergeţi integral stocarea USB? Veţi pierde "<b>"toate"</b>" datele stocate!"</string>
+    <string name="media_format_desc" product="default" msgid="8764037252319942415">"Ștergeţi cardul SD? Veţi pierde "<b>"toate"</b>" datele de pe card!"</string>
+    <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Ștergeţi stocarea USB"</string>
+    <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Ștergeţi cardul SD"</string>
+    <string name="media_format_final_desc" product="nosdcard" msgid="699929778486375913">"Ștergeţi stocarea USB şi toate fişierele stocate pe aceasta? Nu puteţi anula această acţiune!"</string>
+    <string name="media_format_final_desc" product="default" msgid="3344525419872744989">"Ștergeţi cardul SD şi toate fişierele stocate pe acesta? Acţiunea nu poate fi anulată!"</string>
+    <string name="media_format_final_button_text" msgid="4881713344315923175">"Ștergeţi tot"</string>
     <string name="media_format_gesture_prompt" msgid="3109349468816856670">"Desenaţi modelul pentru deblocare"</string>
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi stocarea USB."</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Trebuie să desenaţi modelul de deblocare pentru a confirma că doriţi să ştergeţi cardul SD."</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ajutor"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Reţele mobile"</string>
     <string name="location_title" msgid="1029961368397484576">"Locaţia mea"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Localizare prin Wi-Fi şi mobil"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"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="7457348712272184793">"Locaţie stabilită prin Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Locație stabilită prin Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Sateliţi GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Permiteţi aplicaţiilor să utilizeze GPS de pe tabletă pentru a indica locaţia dvs."</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Permiteţi aplicaţiilor să utilizeze GPS de pe telefon pentru a indica locaţia dvs."</string>
@@ -1060,12 +1084,12 @@
     <string name="install_text" msgid="884360662922471113">"Instalaţi"</string>
     <string name="disable_text" msgid="6544054052049395202">"Dezactivaţi"</string>
     <string name="enable_text" msgid="9217362512327828987">"Activaţi"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"Ştergeţi datele"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">"Ștergeţi datele"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Dezinstalaţi actualizările"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Aţi ales să lansaţi această aplicaţie în mod prestabilit pentru anumite acţiuni."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Aţi ales să permiteţi acestei aplicaţii să creeze widgeturi şi să acceseze datele acestora."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Nu este setată nicio valoare standard."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"Ştergeţi valorile standard"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"Ștergeţi valorile standard"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"Este posibil ca această aplicaţie să nu fie proiectată pentru ecranul dvs. Aici puteţi stabili modul în care aceasta se adaptează ecranului dvs."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"Se stabileşte la lansare"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"Scalaţi aplicaţia"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtraţi"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Alegeţi opţiunile de filtrare"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Toate"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Dezactivate"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Descărcate"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Rulează"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Stocare USB"</string>
@@ -1093,7 +1118,7 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Stocare USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"Stocare card SD"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Se recalculează dimensiunea..."</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ştergeţi datele aplicaţiei?"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Ștergeţi datele aplicaţiei?"</string>
     <string name="clear_data_dlg_text" msgid="8847257251846779938">"Toate datele acestei aplicaţii vor fi şterse definitiv. Aici sunt incluse toate fişierele, setările, conturile, bazele de date etc."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"OK"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Anulaţi"</string>
@@ -1102,7 +1127,7 @@
     <string name="clear_data_failed" msgid="1907582169616856698">"Nu s-au putut şterge datele aplicaţiei."</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Dezinstalaţi actualizările?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Toate actualizările aduse acestei aplicaţii de sistem Android vor fi dezinstalate."</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ştergeţi datele"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Ștergeţi datele"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Nu s-au putut şterge datele aplicaţiei."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Această aplicaţie poate accesa pe tabletă următoarele:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"Această aplicaţie poate accesa următoarele elemente de pe telefonul dvs.:"</string>
@@ -1137,10 +1162,13 @@
     <string name="app_install_location_summary" msgid="5155453752692959098">"Schimbaţi locaţia preferată de instalare pentru noile aplicaţii"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Dezactiv. aplic. încorporată?"</string>
     <string name="app_disable_dlg_text" msgid="3562567756362627323">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să se comporte necorespunzător."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ştergeţi datele şi dezactivaţi aplicaţia?"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Ștergeţi datele şi dezactivaţi aplicaţia?"</string>
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Dacă dezactivaţi o aplicaţie încorporată, este posibil ca alte aplicaţii să funcţioneze incorect. Datele dvs. vor fi, de asemenea, şterse."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Dezactivaţi notificările?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Dacă dezactivaţi notificările pentru această aplicaţie, puteţi pierde alerte şi actualizări importante."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Operații ale aplicației"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Rulează"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nu este utilizată niciodată)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Utilizare stocare"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Afişaţi stocarea utilizată de aplicaţii"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicii în curs de funcţionare"</string>
@@ -1178,10 +1206,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Opriţi serviciul sistemului?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale tabletei să nu mai funcţioneze corect decât după ce o veţi închide şi redeschide."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Dacă opriţi acest serviciu, este posibil ca unele funcţii ale telefonului să nu mai funcţioneze corect decât după ce îl veţi închide şi redeschide."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Limbă şi metodă de intrare"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă şi metodă de intrare"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Limbă și introducere de text"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Limbă și introducere de text"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Setări de limbă"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatură şi metode de introducere"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatură şi introducere de text"</string>
     <string name="phone_language" msgid="8870144109924299673">"Limba"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Înlocuire automată"</string>
@@ -1192,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Setări pentru tastatura fizică"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Apăsaţi de două ori pe tasta de spaţiu pentru a insera „.”"</string>
     <string name="show_password" msgid="3001113966880559611">"Faceţi parolele vizibile"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Această metodă de introducere poate culege în întregime textul introdus, inclusiv datele personale, cum ar fi parolele şi numerele cardurilor de credit. Aceasta provine de la aplicaţia <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi această metodă de introducere?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Această metodă de introducere de text poate culege în întregime textul introdus, inclusiv datele personale, cum ar fi parolele şi numerele cardurilor de credit. Metoda provine de la aplicaţia <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi această metodă de introducere de text?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Acest instrument de verificare a ortografiei poate, de asemenea, să culeagă în întregime textul pe care îl introduceţi, inclusiv datele personale, cum ar fi parolele şi numerele cardurilor de credit. Instrumentul provine de la aplicaţia <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Utilizaţi acest instrument de verificare ortografică?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Setări"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Limbă"</string>
@@ -1221,9 +1249,11 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Cuvânt:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Comandă rapidă:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Limbă:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Introduceți un cuvânt"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Comandă rapidă opțională"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modificaţi cuvântul"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modificaţi"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ştergeţi"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Ștergeţi"</string>
     <string name="user_dict_settings_empty_text" msgid="8165273379942105271">"Nu există cuvinte în dicţionarul utilizatorului. Puteţi adăuga un cuvânt atingând butonul Adăugaţi (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pentru toate limbile"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Mai multe limbi..."</string>
@@ -1236,7 +1266,7 @@
     <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_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>
@@ -1249,7 +1279,7 @@
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"Automat"</string>
     <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"Afişaţi întotdeauna"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ascundeţi întotdeauna"</string>
-    <string name="configure_input_method" msgid="1317429869771850228">"Configuraţi metode de intrare"</string>
+    <string name="configure_input_method" msgid="1317429869771850228">"Setaţi metode de introducere text"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Setări"</string>
     <string name="input_method_settings_button" msgid="6778344383871619368">"Setări"</string>
     <string name="active_input_method_subtypes" msgid="3596398805424733238">"Metode de intrare active"</string>
@@ -1261,8 +1291,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Setări pentru tastatura fizică"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Opţiuni dezvoltator"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Setaţi opţiuni pentru dezvoltarea aplicaţiei"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Opțiunile de dezvoltator nu sunt disponibile pentru acest utilizator"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Depanare USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mod de depanare când este conectat USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Revocați autorizațiile de remediere a erorilor prin USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Rapoarte despre erori în meniul de pornire"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includeţi în meniul de pornire opţiunea de a executa un raport despre erori"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Activ permanent"</string>
@@ -1271,6 +1303,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Permiteţi setările pentru dezvoltare?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Aceste setări sunt destinate exclusiv utilizării pentru dezvoltare. Din cauza lor, este posibil ca dispozitivul dvs. şi aplicaţiile de pe acesta să nu mai funcţioneze sau să funcţioneze necorespunzător."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verificaţi aplicaţiile prin USB"</string>
@@ -1312,26 +1345,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Actualizaţi auto. mărirea ecranului"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualiz. mărirea ecran. la tranziţia între aplic."</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Butonul de pornire încheie apelul"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Butonul de pornire închide"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Rostiţi parolele"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Întârziere la atingere continuă"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Sporiţi accesibilitatea web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Setări"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activată"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Dezactivată"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Permis"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nepermis"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Permiteţi"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nu permiteţi"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Utilizaţi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> poate colecta tot textul pe care îl introduceţi, cu excepţia parolelor. Aceasta include date personale, cum ar fi numerele cardurilor de credit. Serviciul poate colecta şi date despre interacţiunile dvs. cu tableta."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> poate colecta tot textul pe care îl introduceţi, cu excepţia parolelor. Aceasta include date personale, cum ar fi numerele cardurilor de credit. Serviciul poate colecta şi date despre interacţiunile dvs. cu telefonul."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Opriţi <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Atingând OK veţi opri <xliff:g id="SERVICE">%1$s</xliff:g>."</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> trebuie să:"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Remarcă acțiunile dvs."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Primește notificări atunci când interacționați cu o aplicație."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Opriți <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Atingând OK veți opri <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nu există servicii instalate"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Aveţi nevoie de un cititor de ecran?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Serviciul TalkBack oferă feedback vocal pentru a ajuta utilizatorii nevăzători şi cu probleme de vedere. Doriţi să îl instalaţi în mod gratuit din Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Doriţi ca aplicaţiile să instaleze scripturi de la Google, care să facă mai accesibil conţinutul web al acestora?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Nu a fost furnizată o descriere."</string>
     <string name="settings_button" msgid="3006713718908152930">"Setări"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Acumulator"</string>
@@ -1345,14 +1373,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Se încarcă"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ecran activat"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activat"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Utilizată"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Semnal reţea mobilă"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Durată de activitate a dispozitivului"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Timp de funcţionare Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Timp de funcţionare Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Timp de funcționare Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Timp de funcționare Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalii istoric"</string>
     <string name="details_title" msgid="3792801565213935385">"Detalii despre utilizare"</string>
@@ -1360,7 +1388,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Ajustaţi utilizarea de energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Pachete incluse"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ecran"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Aşteptare celulă"</string>
     <string name="power_phone" msgid="5392641106474567277">"Apeluri vocale"</string>
@@ -1370,7 +1398,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Procesor în prim plan"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Menţineţi activ"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Funcţionare Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Funcționare Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tabletă"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Date trimise"</string>
@@ -1383,7 +1411,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informaţii despre aplicaţie"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Setări aplicaţii"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Setări ecran"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Setări Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Setări Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Setări Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Baterie utilizată de apelurile vocale"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Baterie utilizată când tableta este inactivă"</string>
@@ -1392,8 +1420,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Comutaţi la modul Avion pentru a economisi energia în zonele fără acoperire celulară"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Baterie utilizată de afişaj şi de lumina de fundal"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Reduceţi luminozitatea şi/sau durata până la dezactivarea ecranului"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Baterie utilizată de Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Dezactivaţi reţeaua Wi-Fi atunci când nu o utilizaţi sau când nu este disponibilă"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Baterie utilizată de Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Dezactivați rețeaua Wi-Fi atunci când nu o utilizați sau când nu este disponibilă"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Baterie utilizată de Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Dezactivaţi funcţia Bluetooth atunci când nu o utilizaţi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Încercaţi să vă conectaţi la un alt dispozitiv Bluetooth"</string>
@@ -1417,7 +1445,7 @@
     <string name="recognizer_settings_title" msgid="432493301215113154">"Căutare vocală"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Setări pentru „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Setări text în vorbire"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Rezultatul transformării textului în vorbire"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Transformare text în vorbire"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Doresc să se utilizeze întotdeauna setările mele"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Setările prestabilite de mai jos înlocuiesc setările aplicaţiei"</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Setări standard"</string>
@@ -1438,7 +1466,8 @@
     <string name="tts_engine_error" msgid="3305141107104670703">"Motorul pe care l-aţi ales nu poate rula."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Configuraţi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Alegeţi alt motor"</string>
-    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele şi numerele cărţilor de credit. Acesta provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteţi utilizarea acestui motor de sintetizare a vorbirii?"</string>
+    <string name="tts_engine_security_warning" msgid="8786238102020223650">"Acest motor de sintetizare a vorbirii poate culege în întregime textul vorbit, inclusiv datele personale cum ar fi parolele şi numerele cărţilor de credit. Metoda provine de la motorul <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Permiteţi utilizarea acestui motor de sintetizare a vorbirii?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Pentru rezultatul transformării textului în vorbire pentru această limbă este necesară o conexiune de reţea care să funcţioneze."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motoare"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Setări <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> este activat"</string>
@@ -1456,14 +1485,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Motor preferat"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Preferinţe generale"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Comandă alimentare"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Se actualizează setarea Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Se actualizează setarea Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Se actualizează setarea pentru Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"activat"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"dezactivat"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"se activează"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"se dezactivează"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sincronizaţi"</string>
@@ -1478,10 +1507,13 @@
     <string name="credentials_install" product="default" msgid="953914549998062317">"Instalaţi de pe cardul SD"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"Instalaţi certificate de pe stocare"</string>
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Instalaţi certificate de pe cardul SD"</string>
-    <string name="credentials_reset" msgid="3239382277144980418">"Ştergeţi acreditările"</string>
+    <string name="credentials_reset" msgid="3239382277144980418">"Ștergeţi acreditările"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi toate certificatele"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Acreditări de încredere"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afişaţi certificatele CA de încredere"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Tip de stocare"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Stocare hardware"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Stocare software"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenaţi modelul pentru deblocare"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1503,7 +1535,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Creaţi şi restabiliţi copii de rezervă"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Date personale"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Creaţi o copie de rezervă pentru datele dvs."</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"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_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 rezervă"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"În prezent, niciun cont nu stochează datele cu copii de rezervă"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restabilire automată"</string>
@@ -1515,7 +1547,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Parola nouă şi confirmarea acesteia nu se potrivesc."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Setarea parolei de rezervă a eşuat"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Doriţi să opriţi crearea copiilor de rezervă pentru parolele Wi-Fi, marcajele, alte setări, datele aplicaţiilor şi să ştergeţi toate copiile aflate pe serverele Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Doriți să opriți crearea copiei de rezervă pentru parolele Wi-Fi, marcaje, alte setări, datele aplicațiilor și să ștergeți toate copiile aflate pe serverele Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Setări de administrare a dispozitivului"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator de dispozitive"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Dezactivaţi"</string>
@@ -1531,10 +1563,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Notificări"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ton de sonerie şi vibraţii"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Configurare Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Conectaţi-vă la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Se efectuează conectarea la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Conectat la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Configurare Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Conectați-vă la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Se conectează la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Conectat la rețeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Adăugaţi o reţea"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Neconectat"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Adăugaţi reţea"</string>
@@ -1544,7 +1576,7 @@
     <string name="wifi_setup_back" msgid="144777383739164044">"Înapoi"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Detalii reţea"</string>
     <string name="wifi_setup_connect" msgid="7954456989590237049">"Conect."</string>
-    <string name="wifi_setup_forget" msgid="2562847595567347526">"Ştergeţi"</string>
+    <string name="wifi_setup_forget" msgid="2562847595567347526">"Ștergeţi"</string>
     <string name="wifi_setup_save" msgid="3659235094218508211">"Salvaţi"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"Anulaţi"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Se scanează reţelele..."</string>
@@ -1556,9 +1588,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Se conectează..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Accesaţi pasul următor"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP nu este acceptat."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Nu puteţi configura o conexiune Wi-Fi EAP în timpul instalării. După instalare, puteţi face acest lucru în Setări &gt; Reţele wireless."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Nu puteți configura o conexiune Wi-Fi EAP în timpul instalării. După instalare, puteți face acest lucru în Setări &gt; Rețele wireless."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Conectarea poate dura câteva minute..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Atingeţi "<b>"Înainte"</b>" pentru a continua configurarea."\n\n"Atingeţi "<b>"Înapoi"</b>" pentru a vă conecta la o altă reţea Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Atingeți "<b>"Înainte"</b>" pentru a continua configurarea."\n\n"Atingeți "<b>"Înapoi"</b>" pentru a vă conecta la altă rețea Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizare activată"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizare dezactivată"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Eroare de sincronizare."</string>
@@ -1609,7 +1641,7 @@
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduceţi parola pentru a decripta stocarea"</string>
     <string name="try_again" msgid="4272075051293936921">"Încercaţi din nou."</string>
-    <string name="delete" msgid="4219243412325163003">"Ştergeţi"</string>
+    <string name="delete" msgid="4219243412325163003">"Ștergeţi"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fişiere diverse"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"au fost selectate <xliff:g id="NUMBER">%1$d</xliff:g> din <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> din <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -1626,6 +1658,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Înaintea executării, aplicaţia aşteaptă ataşarea depanatorului"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Intrare"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Desen"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Redare accelerată hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorizare"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modul Strict activat"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Ilum. intermit. la operaţii lungi pe firul princ."</string>
@@ -1643,11 +1676,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Max. – min.: albastru, verde, roşu deschis, roşu."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Dezactivaţi suprapun. HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Activaţi monitorizările"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Select. monitoriz. activ."</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"În prezent, nu există monitorizări activate"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> (de) monitorizări activate în prezent"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Toate monitorizările activate în prezent"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Monitorizări OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Afişaţi limite aspect"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
@@ -1657,8 +1685,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Forţaţi utilizarea GPU pentru desen în 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Forţaţi MSAA 4x"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Activaţi MSAA 4x în aplicaţiile OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Remediați operațiile de decupare non-rectangulare"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil redare cu GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Măsurare timp redare în adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scara anim. în fereastră"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Scară pt. anim. cu tranz."</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Scară durată Animator"</string>
@@ -1669,12 +1697,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limita proces. de fundal"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Afişaţi toate elem. ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Afiş. dialog. Aplic. nu răsp. pt. aplic. de fundal"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"WebView experimental"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplicațiile vor utiliza cel mai nou WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Rata de utilizare a datelor"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciclul de util. a datelor"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming de date"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Restricţionaţi datele de fundal"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Utilizarea 4G afişată separat"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Afişaţi utilizarea Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Afișați utilizarea Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Afişaţi utiliz. conex. Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Hotspoturi mobile"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Sincronizaţi datele în mod automat"</string>
@@ -1688,8 +1718,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Setaţi limita pentru date mobile"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Setaţi limita de date 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Setaţi limita de date 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Setaţi limita de date Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Setați limită date Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobile"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1720,9 +1750,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de tableta dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Conexiunea de date mobile va fi dezactivată la atingerea limitei specificate."\n\n"Din moment ce utilizarea de date este măsurată de telefonul dvs., iar operatorul poate contabiliza în mod diferit utilizarea, vă recomandăm să utilizaţi o limită estimativă."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restricţionaţi datele de fundal?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Dacă limitaţi datele mobile de fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Dacă limitaţi transferul de date mobile în fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."\n\n"Această setare afectează toţi utilizatorii de pe această tabletă."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Dacă limitaţi transferul de date mobile în fundal, unele aplicaţii şi servicii nu vor funcţiona decât dacă sunteţi conectat(ă) la o reţea Wi-Fi."\n\n"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi."\n\n"Această setare afectează toți utilizatorii de pe această tabletă."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Dacă limitați transferul de date mobile în fundal, unele aplicații și servicii nu vor funcționa decât dacă sunteți conectat(ă) la o rețea Wi-Fi."\n\n"Această setare afectează toți utilizatorii de pe acest telefon."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avertisment"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limită"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Aplicaţii eliminate"</string>
@@ -1732,10 +1762,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi, conform tabletei. Contabilizarea operatorului poate diferi."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: aprox. <xliff:g id="TOTAL">%1$s</xliff:g> utilizaţi, conform tel. Contabilizarea operatorului dvs. poate diferi."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Hotspoturi mobile"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Selectaţi reţelele Wi-Fi care sunt hotspoturi mobile. Utilizarea acestor reţele de către aplicaţii poate fi restricţionată când ele se află în fundal. De asemenea, aplicaţiile pot emite o avertizare înainte de a utiliza aceste reţele pentru descărcări mari."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Selectați rețelele Wi-Fi care sunt hotspoturi mobile. Utilizarea acestor rețele poate fi restricționată pentru aplicațiile care se află în fundal. De asemenea, aplicațiile pot emite o avertizare înainte de a utiliza aceste rețele pentru descărcări mari."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Reţele mobile"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Reţele Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Pentru a selecta hotspoturi mobile, activaţi Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Rețele Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Pentru a selecta hotspoturi mobile, activați Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Apel de urgenţă"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Reveniţi la apel"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Nume"</string>
@@ -1766,7 +1796,7 @@
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Adăugaţi un profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Editaţi profilul"</string>
-    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ştergeţi profilul"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"Ștergeţi profilul"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Reţea VPN activată permanent"</string>
     <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Selectaţi un profil VPN pentru a rămâne conectat întotdeauna la reţea. Traficul de reţea va fi permis numai atunci când sunteţi conectat(ă) la această reţea VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Niciuna"</string>
@@ -1793,34 +1823,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Facultativ"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Obligatoriu"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Dvs."</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Alţi utilizatori"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Activ"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Inactiv"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Adăugați un utilizator/un profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limitat"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Înainte de a putea crea un profil cu permisiuni limitate, va trebui să configurați blocarea ecranului pentru a vă proteja aplicațiile și datele personale."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Configurați blocarea"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Neconfigurat"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Neconfigurat – Profil cu permisiuni limitate"</string>
     <string name="user_owner" msgid="3879126011135546571">"Proprietar"</string>
+    <string name="user_you" msgid="1639158809315025986">"Dvs. (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Pseudonim"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Adăugați"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Utilizatorii dețin aplicații și materiale proprii"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Puteți restricționa accesul la aplicații și la conținut din contul dvs."</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Utilizator"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Profil limitat"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Adăugaţi un utilizator nou"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Puteţi să permiteţi accesul la acest gadget altor persoane, prin crearea unor utilizatori suplimentari. Fiecare utilizator are propriul spaţiu, pe care îl poate personaliza cu propriile sale aplicaţii, imagini de fundal şi aşa mai departe. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toţi ceilalţi utilizatori."\n\n"După ce creaţi un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare."\n\n"Oricare utilizator poate accepta permisiunile aplicaţiilor actualizate în numele tuturor celorlalţi utilizatori."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Puteți să permiteți accesul la acest gadget altor persoane, prin crearea unor utilizatori suplimentari. Fiecare utilizator are propriul spațiu, pe care îl poate personaliza cu propriile sale aplicații, imagini de fundal etc. De asemenea, utilizatorii pot ajusta setările tabletei, cum ar fi setările pentru Wi-Fi, care afectează pe toți ceilalți utilizatori."\n\n"După ce creați un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare."\n\n"Oricare utilizator poate accepta permisiunile aplicațiilor actualizate în numele tuturor celorlalți utilizatori."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"După ce creaţi un utilizator nou, respectiva persoană trebuie să parcurgă un proces de configurare."\n\n"Oricare utilizator poate accepta permisiunile aplicaţiilor actualizate în numele tuturor celorlalţi utilizatori."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Configuraţi utilizatorul acum?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Asiguraţi-vă că respectiva persoană poate să preia tableta şi să îşi configureze propriul spaţiu"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Configurați profilul acum?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Configuraţi acum"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Nu acum"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
-    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ştergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profilurile cu permisiuni limitate nu pot adăuga conturi"</string>
+    <string name="user_remove_user_menu" msgid="6897150520686691355">"Ștergeţi <xliff:g id="USER_NAME">%1$s</xliff:g> de pe gadget"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Utilizator nou"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Profil nou"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vă eliminaţi ca utilizator?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Eliminaţi utilizatorul?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Eliminați profilul?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Veţi pierde spaţiul şi datele de pe această tabletă. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Veţi pierde spaţiul şi datele de pe acest telefon. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Spaţiul şi datele acestui utilizator vor dispărea de pe tabletă. Nu puteţi anula această acţiune."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Spaţiul şi datele acestui utilizator vor dispărea de pe telefon. Nu puteţi anula această acţiune."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Spațiul și datele acestui profil vor dispărea de pe tabletă. Nu puteți anula această acțiune."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Spațiul și datele acestui profil vor dispărea de pe telefon. Nu puteți anula această acțiune."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Se adaugă un utilizator nou…"</string>
-    <string name="user_delete_user_description" msgid="3158592592118767056">"Ştergeţi utilizatorul"</string>
-    <string name="user_delete_button" msgid="5131259553799403201">"Ştergeţi"</string>
+    <string name="user_delete_user_description" msgid="3158592592118767056">"Ștergeţi utilizatorul"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"Ștergeţi"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Această setare afectează toţi utilizatorii de pe această tabletă."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Această setare afectează toţi utilizatorii de pe acest telefon."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Schimbaţi limba"</string>
@@ -1831,4 +1877,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisii celulare"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selectaţi tipurile de alerte de urgenţă de afişat."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Restricții aplicații și conținut"</string>
+    <string name="user_rename" msgid="8523499513614655279">"REDENUMIȚI"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Setați limite pentru aplicații"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Permiteți modificarea împerecherilor și setărilor Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Permiteți schimbul de date atunci când tableta atinge alt dispozitiv"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Permiteți schimbul de date atunci când telefonul atinge alt dispozitiv"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Acces la locație"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Permiteți ca aplicațiile să utilizeze informațiile despre locație"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Înapoi"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Înainte"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Finalizați"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Faceți o fotografie"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Alegeți o fotografie din Galerie"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c025ed0..c63f13d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Медленная"</item>
     <item msgid="1145554631248513562">"Обычная"</item>
     <item msgid="7553665153391107454">"Быстрая"</item>
-    <item msgid="2538100882620724753">"Очень быстрая"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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,7 +154,7 @@
   <string-array name="wifi_sleep_policy_entries">
     <item msgid="3269131034472904310">"Не выключать"</item>
     <item msgid="844721238536786870">"Только при питании от сети"</item>
-    <item msgid="2990218920631468642">"Всегда выключать (моб. трафик больше)"</item>
+    <item msgid="2990218920631468642">"Всегда выключать (увеличивает объем моб. трафика)"</item>
   </string-array>
   <string-array name="wifi_sleep_policy_entries_wifi_only">
     <item msgid="2124319326282651391">"Не выключать"</item>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Нет"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Нет"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Не указано"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Нет"</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">"Внутренняя память устройства"</item>
     <item msgid="3738430123799803530">"Съемная SD-карта"</item>
     <item msgid="4498124044785815005">"На усмотрение системы"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Местоположение"</item>
+    <item msgid="255608127647030286">"Личные данные"</item>
+    <item msgid="4588829735729884491">"SMS/MMS"</item>
+    <item msgid="8971765125227378270">"Устройство"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"приблизительное местоположение"</item>
+    <item msgid="5789673140227507995">"точное местоположение"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"вибросигнал"</item>
+    <item msgid="3434165993711230924">"считывать данные контактов"</item>
+    <item msgid="616161687718081936">"изменение контактов"</item>
+    <item msgid="7638002295329050091">"просмотр списка вызовов"</item>
+    <item msgid="6546959730920410907">"изменение списка вызовов"</item>
+    <item msgid="446877710771379667">"считывать данные календаря"</item>
+    <item msgid="7674458294386319722">"изменение календаря"</item>
+    <item msgid="8281201165558093009">"поиск Wi-Fi"</item>
+    <item msgid="8694611243479480497">"уведомление"</item>
+    <item msgid="7776439107987345446">"поиск мобильных сетей"</item>
+    <item msgid="514615766544675057">"позвонить"</item>
+    <item msgid="8181415497109310680">"чтение SMS"</item>
+    <item msgid="6816551144382117307">"создание SMS"</item>
+    <item msgid="4600463921908905030">"получение SMS"</item>
+    <item msgid="5958926493289432745">"получение экстренных SMS"</item>
+    <item msgid="4945269495221089540">"получение MMS"</item>
+    <item msgid="5570472453573929087">"получение сообщений WAP PUSH"</item>
+    <item msgid="7125408150230860501">"отправка SMS"</item>
+    <item msgid="7080337936612188061">"чтение SMS со смарт-карты"</item>
+    <item msgid="587124103118495063">"запись SMS на смарт-карту"</item>
+    <item msgid="2320577158869025503">"изменение настроек"</item>
+    <item msgid="1545733463471924009">"отображать поверх других элементов"</item>
+    <item msgid="3609046903962454582">"доступ к уведомлениям"</item>
+    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="1097324338692486211">"записать аудио"</item>
+    <item msgid="5031552983987798163">"воспроизвести аудио"</item>
+    <item msgid="8374996688066472414">"считать из буфера обмена"</item>
+    <item msgid="3045529469061083747">"изменить буфер обмена"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Местоположение"</item>
+    <item msgid="8677040780775113033">"Местоположение"</item>
+    <item msgid="1660743989948992916">"Местоположение"</item>
+    <item msgid="8791172739860195290">"Вибросигнал"</item>
+    <item msgid="383413555642128046">"Считывать данные контактов"</item>
+    <item msgid="3654594895269697313">"Изменение контактов"</item>
+    <item msgid="7928393476362362538">"Просмотр списка вызовов"</item>
+    <item msgid="6248591205254641116">"Изменение списка вызовов"</item>
+    <item msgid="6093344633066170692">"Считывать данные календаря"</item>
+    <item msgid="1334886368750347692">"Изменение календаря"</item>
+    <item msgid="1638204101698708656">"Местоположение"</item>
+    <item msgid="2154671955760380322">"Разместить уведомление"</item>
+    <item msgid="4282477730595931828">"Местоположение"</item>
+    <item msgid="4891423912898525905">"Позвонить"</item>
+    <item msgid="626463821668200388">"Получение SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Отправка SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Получение SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Получение SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Получение SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Получение SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Отправка SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Получение SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Отправка SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Изменение настроек"</item>
+    <item msgid="736541391767350377">"Отображать поверх других элементов"</item>
+    <item msgid="5530815681721654194">"Доступ к уведомлениям"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Записать аудио"</item>
+    <item msgid="3493046322001257041">"Воспроизвести аудио"</item>
+    <item msgid="136815868796597058">"Считать из буфера обмена"</item>
+    <item msgid="5238692940326972503">"Изменить буфер обмена"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Небольшая"</item>
     <item msgid="2560532955514699713">"Средняя"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (графика)"</item>
     <item msgid="1340692776955662664">"Список вызовов в glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"На экране в виде полос"</item>
+    <item msgid="8272260411216018353">"На экране в виде линий"</item>
+    <item msgid="120512413928262547">"В adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартное ограничение"</item>
     <item msgid="4071574792028999443">"Без фоновых процессов"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 72cc057..36b4449 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Ещё..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Беспроводные сети"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Wi-Fi, Bluetooth, режим полета, мобильные сети и VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, режим полета, мобильные сети и VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Интернет-роуминг"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Подключаться к службам передачи данных при роуминге"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Подключаться к службам передачи данных при роуминге"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введите текст для показа на экране блокировки"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показывать введенный ниже текст на экране блокировки"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Сведения о пользователе"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показывать информацию профиля на заблокированном экране"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Информация профиля"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Мое местоположение"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безопасность"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Администрирование устройства"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Администраторы устройства"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотрите или отключите администраторов устройств"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Доступ к уведомлениям"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включить Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -492,12 +503,12 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
-    <string name="wifi_display_settings_title" msgid="564299108014609382">"Беспроводной проектор"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Беспроводной монитор"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Чтобы просмотреть список устройств, включите беспроводной проектор."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Беспроводной проектор отключен, так как не работает Wi-Fi."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Найти экраны"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Функция отключена, т. к. нет Wi-Fi-соединения."</string>
+    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Поиск"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Поиск…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Рядом нет беспроводных экранов"</string>
+    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Беспроводные мониторы не обнаружены"</string>
     <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Сопряженные экраны"</string>
     <string name="wifi_display_available_devices" msgid="4558314642853513487">"Доступные устройства"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Подключение…"</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Когда включена эта функция, вы можете обмениваться данными между устройствами, просто приложив их друг к другу."\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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Включить Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Настройки Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Включить Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Настройки Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Настройка и управление точками доступа беспроводной сети"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Включение Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Отключение Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Выбор сети Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Включение Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Отключение Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Ошибка"</string>
     <string name="wifi_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="3038290727701553612">"Сообщать при обнаружении открытой сети"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Фильтр сетей Wi-Fi"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wi-Fi в спящем режиме"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Всегда искать сети"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Разрешить службе геопозиционирования и другим приложениям Google искать сети, даже если модуль Wi-Fi выключен"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Установка сертификатов"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Чтобы улучшить определение местоположения, а также для достижения других целей, Google и другие приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Приложения могут выполнять поиск сетей поблизости, даже если сеть Wi-Fi отключена. Чтобы изменить эти настройки, перейдите в меню \"Дополнительно &gt; Всегда искать сети\"."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Больше не показывать"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Wi-Fi в спящем режиме"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Не удалось изменить этот параметр"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Оптимизация Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Экономить заряд батареи, когда используется Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Оптимизация Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Экономить заряд батареи, когда используется Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Добавить сеть"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Сети Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Сети Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ещё"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Вход по PIN-коду WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Удалить эту сеть"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Изменить сеть"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Чтобы просмотреть доступные сети, включите Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Поиск сетей Wi-Fi…"</string>
-    <string name="wifi_other_network" msgid="1048006316504242214">"Другие сети…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Чтобы посмотреть доступные сети, включите Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Поиск сетей Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"У вас недостаточно прав для изменения настроек сети Wi‑Fi"</string>
+    <string name="wifi_other_network" msgid="1048006316504242214">"Другая сеть…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Ещё"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Автонастройка (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Для завершения настройки необходимо подключение к сети Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Для завершения настройки необходимо подключение к сети Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Дополнительно"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка Wi-Fi"</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="7204827509934892103">"Нажмите кнопку \"Безопасная настройка Wi-Fi\" на своем маршрутизаторе. Она может называться WPS, а также содержать следующий символ:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Введите PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Нажмите кнопку \"Безопасная настройка 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="5754399645462924103">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Выполняется настройка WPS. Для завершения потребуется не более двух минут."</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Ошибка. Повторите попытку через несколько минут."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безопасная настройка беспроводного маршрутизатора (WEP) не поддерживается"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ошибка аутентификации. Повторите попытку."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Обнаружен другой сеанс WPS. Повторите попытку через несколько минут."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Имя сети (SSID)"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Введите имя сети SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Защита"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Уровень сигнала"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Отклонить"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Подключить"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Не удалось подключиться к сети."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Удалить"</string>
@@ -608,16 +630,16 @@
     <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_dont_skip" msgid="7350341524881124808">"Не пропускать"</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="3335132188969450252">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка устройства может потребовать передачи большого объема данных по сети."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ВНИМАНИЕ! Возможны дополнительные расходы на услуги оператора связи."\n\n"Настройка устройства может потребовать передачи большого объема данных по сети."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ВНИМАНИЕ! Поиск обновлений для программного обеспечения не поддерживается."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ВНИМАНИЕ! Поиск обновлений для программного обеспечения не поддерживается."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Не удалось подключиться к сети Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Не удалось подключиться к сети Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Дополнительные функции"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Полоса частот Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ВНИМАНИЕ! Без подключения к Интернету невозможно проверить наличие обновлений для ПО."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ВНИМАНИЕ! Без подключения к Интернету невозможно проверить наличие обновлений для ПО."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Не удалось подключиться к сети Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Не удалось подключиться к сети Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Дополнительные функции"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Полоса частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Укажите рабочий диапазон частот"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"При настройке полосы частот возникла неполадка."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адрес"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Длина префикса сети"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Информация об устройстве"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запомнить это соединение"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Поиск устройств"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Удалить эту группу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативная точка доступа Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Включение точки доступа…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключение точки доступа…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ошибка подключения"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Настройка точки доступа"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Ошибка подключения к точке доступа"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Настройка точки доступа Wi-Fi"</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">"Хот-спот Android"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -725,7 +747,7 @@
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Всегда"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Во время зарядки"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"В док-станции"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ВЫКЛ"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выкл."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Чтобы знать, что происходит с телефоном, когда он подключен к док-станции или находится в спящем режиме, включите заставку."</string>
     <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Когда включать"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Включить"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Уровень сигнала"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Роуминг"</string>
     <string name="status_operator" msgid="2274875196954742087">"Сеть"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-адрес Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адрес Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адрес Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серийный номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN вкл."</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN выкл."</string>
     <string name="bearer" msgid="594270280031923558">"Владелец"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Тип MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Значение MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Удалить APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Новая точка доступа"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сохранить"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Справка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобильная сеть"</string>
     <string name="location_title" msgid="1029961368397484576">"Мое местоположение"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"По координатам сети"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Местоположение определяется с помощью Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"По спутникам GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Разрешить приложениям использовать GPS для точного определения вашего местоположения"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Разрешить приложениям использовать GPS для точного определения вашего местоположения"</string>
@@ -969,12 +993,12 @@
     <string name="location_access_title" msgid="7064108942964081243">"Доступ к моим геоданным"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Разрешить приложениям использовать данные о вашем местоположении"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Определение местоположения"</string>
-    <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшетном ПК"</string>
+    <string name="about_settings" product="tablet" msgid="593457295516533765">"О планшете"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"О телефоне"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Просмотр юридической информации, состояния планшетного ПК и версии ПО"</string>
     <string name="legal_information" msgid="5769301644270604095">"Юридическая информация"</string>
     <string name="contributors_title" msgid="5917703088825286504">"Участники"</string>
-    <string name="regulatory_information" msgid="5695464367088752150">"Юридическая информация"</string>
+    <string name="regulatory_information" msgid="5695464367088752150">"Сертификация"</string>
     <string name="copyright_title" msgid="865906688917260647">"Авторские права"</string>
     <string name="license_title" msgid="1990487604356037871">"Лицензия"</string>
     <string name="terms_title" msgid="7697580845616764642">"Условия использования"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Фильтр"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Выберите параметры фильтра"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Все"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Отключенные"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Сторонние"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Работающие"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-накопитель"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Если отключить встроенное приложение, другие приложения могут работать неправильно. Кроме того, будут удалены все данные."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Отключить уведомления?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Если в настройках этого приложения отключены уведомления, вы можете пропустить важные оповещения и обновления."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Операции в приложениях"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Выполняется"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(не использовалось)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Использование памяти"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Объем памяти, занимаемый приложениями"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие приложения"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слово:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Быстрые клавиши:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Язык:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Введите слово"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Быстрые клавиши"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Изменение слова"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Изменить"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Удалить"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Настройки физической клавиатуры"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Для разработчиков"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Настройка параметров для разработчиков"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Этому пользователю недоступны возможности разработчика"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Запретить доступ для отладки с помощью USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Отчеты об ошибках"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Показывать в меню опцию отправки отчета об ошибке"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Не выключать экран"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Изменение настроек"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Только для разработчиков. Изменение этих настроек может привести к сбоям или неправильной работе устройства и приложений."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Установленные через USB"</string>
@@ -1305,32 +1338,27 @@
     <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Эта функция позволяет увеличивать и уменьшать изображение, трижды нажав на экран."\n\n"При увеличенном масштабе можно:"\n<ul><li>"панорамировать – проведите пальцами по экрану;"</li>\n<li>"изменять масштаб – сведите или разведите пальцы."</li></ul>\n\n"Чтобы временно увеличить изображение под пальцем, трижды нажмите на экран и удерживайте его. Проведя пальцем, вы можете посмотреть на другие области экрана. Чтобы вернуть экран в прежнее состояние, уберите палец."\n\n"Примечание. Тройным нажатием увеличиваются все области, кроме клавиатуры и панели навигации."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Быстрое включение"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Вкл."</string>
-    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"ВЫКЛ"</string>
+    <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Выкл."</string>
     <string name="accessibility_global_gesture_preference_description" msgid="750438015254396963">"Вы сможете быстро включать специальные возможности. Вот как это сделать."\n\n"1. Нажмите кнопку питания и удерживайте ее, пока не раздастся звуковой сигнал или вибросигнал."\n\n"2. Нажмите на экран двумя пальцами и не отпускайте их, пока не услышите сообщение о том, что команда выполнена."\n\n"Если устройством пользуется несколько человек, специальные возможности будут включены до тех пор, пока устройство не будет разблокировано или не будет выбран другой пользователь."</string>
     <string name="accessibility_toggle_large_text_preference_title" msgid="6307247527580207161">"Крупный текст"</string>
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Сохранять масштаб"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Сохранять масштаб при переходе между приложениями"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кнопка питания завершает вызов"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ВЫКЛ завершает вызов"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Озвучивать пароли"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Задержка при нажатии и удержании"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Специальные веб-скрипты"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Настройки"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Включено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Выключено"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Разрешена"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Запрещена"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Разрешить"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Запретить"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Использовать <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Служба <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> может сохранять любой вводимый текст, кроме паролей. В частности, сохраняются личные сведения, например номера кредитных карт. Кроме того, могут собираться данные об использовании планшетного ПК."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Служба <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> может сохранять любой вводимый текст, кроме паролей. В частности, сохраняются личные сведения, например номера кредитных карт. Кроме того, могут собираться данные об использовании телефона."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Отключить <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Чтобы отключить <xliff:g id="SERVICE">%1$s</xliff:g>, нажмите ОК."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Обрабатывать ваши действия."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Получать информацию о том, какие действия вы выполняете в приложении."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Остановить службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Чтобы отключить <xliff:g id="SERVICE">%1$s</xliff:g>, нажмите ОК."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Службы не установлены"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Нужна программа чтения с экрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Бесплатное приложение TalkBack дает голосовое описание элементов интерфейса для пользователей с нарушением зрения. Установить его из Android Маркета?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Разрешить приложениям устанавливать скрипты Google для повышения доступности веб-контента?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Нет описания"</string>
     <string name="settings_button" msgid="3006713718908152930">"Настройки"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</string>
@@ -1341,17 +1369,17 @@
     <string name="battery_since_reset" msgid="7464546661121187045">"Расход заряда батареи с момента перезагрузки"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> от батареи"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> с момента отключения от питания"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Идет зарядка"</string>
-    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Экран включен"</string>
-    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS вкл."</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
-    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Режим бодрствования"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Зарядка батареи"</string>
+    <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Работа экрана"</string>
+    <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"Работа GPS"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
+    <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Активный режим"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Уровень сигнала моб. сети"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Время работы Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Время работы Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Время работы Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Время работы Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Подробная история"</string>
     <string name="details_title" msgid="3792801565213935385">"Расход батареи"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Режим энергопотребления"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Вложенные пакеты"</string>
     <string name="power_screen" msgid="3023346080675904613">"Экран"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Связь с сетью"</string>
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ЦП – акт. режим"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Акт. режим"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Модуль Wi-Fi включен"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Планшетный ПК"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Отправлено"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"О приложении"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Настройки приложения"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Настройки экрана"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Настройки Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Настройки Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Настройки Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Использование батареи для голосовых вызовов"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Расход заряда батареи в режиме ожидания"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Если нет доступа в сеть, вкл. режим полета для экономии заряда"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Использование батареи для подсветки экрана"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Уменьшить яркость экрана и/или время до отключения экрана"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Использование батареи модулем Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Отключить модуль Wi-Fi, когда он не используется или сеть недоступна"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Расход заряда батареи при подключении к Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Отключать модуль Wi-Fi, когда он не используется или сеть недоступна"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Использование батареи модулем Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Отключите канал Bluetooth, если он не используется"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Попробуйте подключиться к другому Bluetooth-устройству"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Настроить"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Выбрать другую систему"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Данная система синтеза речи может записывать произносимые слова, включая личные данные, такие как пароли и номера кредитных карт. Это осуществляет система <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Разрешить использование этой системы синтеза речи?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Чтобы включить синтезатор речи для этого языка, необходимо подключение к Интернету."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Системы"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> вкл."</string>
@@ -1454,15 +1483,15 @@
     <string name="tts_engine_settings_button" msgid="1030512042040722285">"Настройки синтеза речи"</string>
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Система по умолчанию"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Общие"</string>
-    <string name="gadget_title" msgid="5519037532720577836">"Упр. питанием"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Обновление настроек Wi-Fi"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"Энергосбережение"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Обновление настроек Wi-Fi…"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Обновление настроек Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g>: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"включено"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"отключено"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"включение…"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"выключение…"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронизация"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надежные сертификаты"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Тип хранилища"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Аппаратное"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Только программное"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Резервное копирование и восстановление"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Возврат к заводским настройкам"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Резервирование данных"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Сохранять резервные копии данных приложений, паролей точек доступа Wi-Fi и настроек на серверах Google"</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="auto_restore_title" msgid="5397528966329126506">"Автовосстановление"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Пароли не совпадают"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Не удалось установить резервный пароль"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Прекратить резервное копирование паролей точек доступа Wi-Fi, закладок, других настроек и данных приложений, а также удалить все копии с серверов Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Прекратить резервное копирование паролей точек доступа Wi-Fi, закладок, других настроек и данных приложений, а также удалить все копии с серверов Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Настройки администрирования устройства"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор устройства"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Отключить"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Оповещения"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Вибросигнал и рингтон"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Системные уведомления"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Настройки Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Подключение к сети Wi-Fi: <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Подключено к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Настройки Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Добавьте сеть"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Не подключено"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Добавить сеть"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Подключение..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Далее"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP не поддерживается."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Во время установки нельзя настроить подключение к сети Wi-Fi с защитой EAP. Вы можете сделать это позже в меню \"Настройки &gt; Беспроводные сети\"."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Во время установки нельзя настроить подключение к сети Wi-Fi с защитой EAP. Вы можете сделать это позже в меню \"Настройки &gt; Беспроводные сети\"."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Подключение может занять несколько минут..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Нажмите "<b>"Далее"</b>" для продолжения установки."\n\n"Нажмите "<b>"Назад"</b>" для подключения к другой сети Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Нажмите "<b>"Далее"</b>", чтобы продолжить настройку."\n\n"Нажмите "<b>"Назад"</b>", чтобы подключиться к другой сети Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизация включена"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизация отключена"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Ошибка синхронизации."</string>
@@ -1570,7 +1602,7 @@
     <string name="background_data_summary" msgid="8328521479872763452">"Синхронизация, отправка и получение данных доступны всегда"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Откл. фоновый режим?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Отключение фонового режима обмена данными экономит заряд батареи и уменьшает объем трафика, однако некоторые приложения могут использовать этот режим даже после его отключения."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Cинхронизировать данные приложений"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Cинхронизировать"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхронизация включена"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхронизация выключена"</string>
     <string name="sync_error" msgid="5060969083117872149">"Ошибка синхронизации"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Приложение ожидает подключения отладчика"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Ввод текста"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Рисование"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Аппаратное ускорение визуализации"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Мониторинг"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Включен строгий режим"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Подсвечивать экран во время длительных операций"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Порядок: синий, зеленый, светло-красный, красный"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Откл. аппарат. наложения"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Включить трассировки"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Включение трассировок"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Все трассировки отключены"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Включено трассировок: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Все трассировки включены"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Вкл. трассировку OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показывать границы элементов"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Всегда использовать GPU для двухмерного рисования"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Включить 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Включить 4x MSAA в приложениях OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Отладить операции непрямоугольного усечения"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Запись времени работы GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Измерение времени для adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Окно: масштаб"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Переход: масштаб"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Скорость анимации"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Лимит фоновых процессов"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Все ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Уведомлять о том, что приложение не отвечает"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Использовать WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Приложения будут использовать бета-версию WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Период статистики"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Интернет-роуминг"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ограничить фон. режим"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Только по каналу 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Трафик Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Показывать трафик Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Показывать загрузку Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Точки доступа к моб. сети"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Автосинхронизация данных"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Установить лимит"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Лимитировать трафик 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Лимитировать трафик 2G и 3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Лимитировать трафик Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Установить лимит трафика Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Моб. сети"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"Трафик 4G"</string>
@@ -1719,22 +1749,22 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"По достижении лимита трафика передача данных по мобильной сети будет отключена."\n\n"Во избежание дополнительных расходов старайтесь не достигать этого лимита, так как оператор и ваше устройство могут по-разному учитывать трафик."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Ограничение фонового режима"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Если ограничить передачу данных в фоновом режиме, некоторые приложения и службы не будут работать без подключения к сети Wi-Fi."\n\n"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Предупреждение"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"Лимит"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Удаленные приложения"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Удаленные приложения и пользователи"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"Получено: <xliff:g id="RECEIVED">%1$s</xliff:g>; отправлено: <xliff:g id="SENT">%2$s</xliff:g>"</string>
-    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: ≈<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (трафик, определенный устройством). Данные оператора могут отличаться."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (трафик, определенный устройством). Данные оператора могут отличаться."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Точки доступа к моб. сети"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Выберите сети Wi-Fi с тарификацией трафика. Возможно, приложения не смогут использовать их для работы в фоновом режиме. Кроме того, перед загрузкой больших объемов данных может появляться предупреждение."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Выберите сети Wi-Fi с тарификацией трафика. Возможно, приложения не смогут использовать их для работы в фоновом режиме. Кроме того, перед загрузкой больших объемов данных может появляться предупреждение."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобильные сети"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Сети Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Чтобы выбрать точку доступа, включите Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Сети Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Чтобы выбрать точку доступа, включите Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Вызов службы экстренной помощи"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Вернуться к вызову"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Название сети"</string>
@@ -1794,34 +1824,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Только предупреждение"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Блокировка"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Пользователи"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Вы"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Другие пользователи"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Добавить пользователя"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Активен"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивен"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Пользователи и профили"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Добавить пользователя/профиль"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Профиль с ограниченным доступом"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Чтобы создать профиль с ограниченным доступом, необходимо предварительно настроить блокировку экрана для защиты приложений и личных данных"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Включить блокировку"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не настроено"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не настроено – профиль с ограниченным доступом"</string>
     <string name="user_owner" msgid="3879126011135546571">"Владелец"</string>
+    <string name="user_you" msgid="1639158809315025986">"Вы (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдоним"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Добавление"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"У пользователей есть свои приложения и контент"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Вы можете ограничить доступ к приложениям и контенту из вашего аккаунта"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Добавить пользователя"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профиль с огр. доступом"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Добавить пользователя"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Если устройством пользуется несколько человек, заведите для них отдельные учетные записи. В результате у каждого пользователя появится свое пространство, где можно будет установить собственные приложения или обои. При этом некоторые параметры, например настройки Wi-Fi, останутся общими для всех."\n\n"Обновление приложений будет происходить для всех учетных записей одновременно. Установить обновление сможет любой пользователь."\n\n</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Если вашим устройством пользуется кто-то ещё, создайте отдельные аккаунты. У каждого будет свое пространство, где можно, например, установить приложения или выбрать обои. Некоторые параметры, такие как настройки сети Wi-Fi, будут общими для всех."\n\n"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Каждый новый пользователь должен выполнить настройку."\n\n"Пользователи могут разрешать обновления для любых аккаунтов на устройстве."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Настроить аккаунт?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Если у пользователя нет возможности настроить аккаунт прямо сейчас, он сможет сделать это позже."</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Настроить профиль?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Настроить сейчас"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сейчас"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Только владелец может настроить устройство для других пользователей."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Только владелец может настроить устройство для других пользователей."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Пользователи с ограниченным доступом не могут добавлять аккаунты"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Удалить пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новый пользователь"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Новый профиль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Удалить ваш аккаунт?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Удалить аккаунт?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Удалить профиль?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ваши данные, сохраненные на этом устройстве, будут удалены без возможности восстановления."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ваши данные, сохраненные на этом устройстве, будут удалены без возможности восстановления."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Сохраненные на устройстве данные этого пользователя будут удалены без возможности восстановления."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Сохраненные на устройстве данные этого пользователя будут удалены без возможности восстановления."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Сохраненные на планшетном ПК данные этого профиля будут удалены без возможности восстановления"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Сохраненные на телефоне данные этого профиля будут удалены без возможности восстановления"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Добавление…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Удалить пользователя"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Удалить"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Разрешить приложения и контент"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Приложения с ограничениями"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Развернуть настр. приложений"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Настройки будут изменены для всех пользователей устройства."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Измените язык"</string>
@@ -1830,6 +1876,27 @@
     <string name="help_label" msgid="1107174367904110532">"Справка"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Аккаунт для контента"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Документ с фото"</string>
-    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широковещательная передача сообщений"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберите типы экстренных оповещений на экране."</string>
+    <string name="cell_broadcast_settings" msgid="8415582011920085222">"Оповещение населения"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Укажите, какие оповещения вы хотите получать"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Ограничения для приложения и контента"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРЕИМЕНОВАТЬ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Установить ограничения"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi и мобильная сеть"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Разрешить изменение настроек Wi‑Fi и мобильной сети"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Разрешить изменение настроек Bluetooth-подключения"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Разрешить обмен данными при совмещении планшета с другим устройством"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Мое местоположение"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Разрешить приложениям использовать данные о вашем местоположении"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Далее"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Готово"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Сделать снимок"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Выбрать из Галереи"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 0a5865c..6ab5e68 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Pomalá"</item>
     <item msgid="1145554631248513562">"Normálna"</item>
     <item msgid="7553665153391107454">"Rýchla"</item>
-    <item msgid="2538100882620724753">"Veľmi rýchla"</item>
+    <item msgid="1370673569131070146">"Rýchlejšia"</item>
+    <item msgid="4648206845228970803">"Veľmi rýchla"</item>
+    <item msgid="4977949754169483251">"Svižná"</item>
+    <item msgid="6106302964845503577">"Veľmi svižná"</item>
+    <item msgid="6800277205640837264">"Najrýchlejšia"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Veľmi nízka"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Žiadne"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žiadne"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Neurčené"</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">"Interný ukladací priestor zariadenia"</item>
     <item msgid="3738430123799803530">"Odnímateľná karta SD"</item>
     <item msgid="4498124044785815005">"Automaticky vyberie systém"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Poloha"</item>
+    <item msgid="255608127647030286">"Osobné"</item>
+    <item msgid="4588829735729884491">"SMS a MMS"</item>
+    <item msgid="8971765125227378270">"Zariadenie"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"približná poloha"</item>
+    <item msgid="5789673140227507995">"presná poloha"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibrovanie"</item>
+    <item msgid="3434165993711230924">"čítanie kontaktov"</item>
+    <item msgid="616161687718081936">"úprava kontaktov"</item>
+    <item msgid="7638002295329050091">"čítanie denníka hovorov"</item>
+    <item msgid="6546959730920410907">"úprava denníka hovorov"</item>
+    <item msgid="446877710771379667">"čítanie kalendára"</item>
+    <item msgid="7674458294386319722">"úprava kalendára"</item>
+    <item msgid="8281201165558093009">"prehľadanie sietí Wi-Fi"</item>
+    <item msgid="8694611243479480497">"upozornenie"</item>
+    <item msgid="7776439107987345446">"prehľadanie mobilných sietí"</item>
+    <item msgid="514615766544675057">"volanie na telefón"</item>
+    <item msgid="8181415497109310680">"čítanie správ SMS"</item>
+    <item msgid="6816551144382117307">"písanie správ SMS"</item>
+    <item msgid="4600463921908905030">"príjem správ SMS"</item>
+    <item msgid="5958926493289432745">"príjem núdzových správ SMS"</item>
+    <item msgid="4945269495221089540">"príjem správ MMS"</item>
+    <item msgid="5570472453573929087">"príjem správ WAP push"</item>
+    <item msgid="7125408150230860501">"odosielanie správ SMS"</item>
+    <item msgid="7080337936612188061">"čítanie správ ICC SMS"</item>
+    <item msgid="587124103118495063">"písanie správ ICC SMS"</item>
+    <item msgid="2320577158869025503">"úprava nastavení"</item>
+    <item msgid="1545733463471924009">"vykreslenie navrch"</item>
+    <item msgid="3609046903962454582">"prístup k upozorneniam"</item>
+    <item msgid="4671646036128214513">"fotoaparát:"</item>
+    <item msgid="1097324338692486211">"záznam zvuku"</item>
+    <item msgid="5031552983987798163">"prehrávanie zvuku"</item>
+    <item msgid="8374996688066472414">"načítať schránku"</item>
+    <item msgid="3045529469061083747">"upraviť schránku"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Poloha"</item>
+    <item msgid="8677040780775113033">"Poloha"</item>
+    <item msgid="1660743989948992916">"Poloha"</item>
+    <item msgid="8791172739860195290">"Vibrovanie"</item>
+    <item msgid="383413555642128046">"Čítanie kontaktov"</item>
+    <item msgid="3654594895269697313">"Úprava kontaktov"</item>
+    <item msgid="7928393476362362538">"Čítanie denníka hovorov"</item>
+    <item msgid="6248591205254641116">"Úprava denníka hovorov"</item>
+    <item msgid="6093344633066170692">"Čítanie kalendára"</item>
+    <item msgid="1334886368750347692">"Úprava kalendára"</item>
+    <item msgid="1638204101698708656">"Poloha"</item>
+    <item msgid="2154671955760380322">"Upozornenie na príspevok"</item>
+    <item msgid="4282477730595931828">"Poloha"</item>
+    <item msgid="4891423912898525905">"Volanie na telefón"</item>
+    <item msgid="626463821668200388">"Príjem SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Odosielanie SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Príjem SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Príjem SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Príjem SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Príjem SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Odosielanie SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Príjem SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Odosielanie SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Úprava nastavení"</item>
+    <item msgid="736541391767350377">"Vykreslenie navrch"</item>
+    <item msgid="5530815681721654194">"Prístup k upozorneniam"</item>
+    <item msgid="781213371706962767">"Fotoaparát"</item>
+    <item msgid="1720492593061838172">"Zaznamenať zvuk"</item>
+    <item msgid="3493046322001257041">"Prehrať zvuk"</item>
+    <item msgid="136815868796597058">"Načítať schránku"</item>
+    <item msgid="5238692940326972503">"Upraviť schránku"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Krátka"</item>
     <item msgid="2560532955514699713">"Stredná"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"Volať zásobník pri chybe glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Vypnuté"</item>
+    <item msgid="675719912558941285">"Neobdĺžniková oblasť klipu modrou"</item>
+    <item msgid="1064373276095698656">"Test. príkazy vykresľovania zelenou"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Vypnuté"</item>
+    <item msgid="2751513398307949636">"Na obrazovke v podobe stĺpcov"</item>
+    <item msgid="8272260411216018353">"Na obrazovke v podobe riadkov"</item>
+    <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Štandardný limit"</item>
     <item msgid="4071574792028999443">"Žiadne procesy na pozadí"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 0412b3f..ccecb63 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V lietadle"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Viac..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrôtové pripojenie a siete"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Spravovať Wi-Fi, Bluetooth, režim V lietadle, mobilné siete a siete VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi-Fi, Bluetooth, režim V lietadle, mobilné siete a siete VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dátové služby pri roamingu"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Dátové služby sa môžu pripájať pri roamingu"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Dátové služby sa môžu pripojiť pri roamingu"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadajte text, ktorý sa zobrazí na uzamknutej obrazovke"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobraz. informácie používateľa na uzamk. obrazovke"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Inf. o používateľovi"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobraziť inform. o profile na uzamknutej obrazovke"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Informácie o profile"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Prístup k polohe"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Zabezpečenie"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zariadenia"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Správcovia zariadenia"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobraziť alebo deaktivovať správcov zariadenia"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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 správ, ktoré sa vám odoslali. Aplikácia bude tiež môcť tieto upozornenia zrušiť alebo sa dotknúť tlačidiel akcií v upozorneniach."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnúť Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamätať nastavenia"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Bezdrôtový displej"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ak chcete zobraziť zariadenia, zapnite bezdrôtový displej."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Bezdrôtový displej je zakázaný, pretože sieť je Wi-Fi vypnutá."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Bezdrôtový displej je zakázaný, pretože je vypnuté pripojenie Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Vyhľadávať displeje"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Vyhľadávanie..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"V blízkosti sa nenašli žiadne displeje s bezdrôtovým pripojením."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Ak je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Napríklad môžete odosielať stránky prehliadača, videá YouTube, osobné kontakty a ďalšie."\n\n"Stačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom sa dotknúť obrazovky. Aplikácia určí, aký obsah bude odoslaný."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Vyhľadávanie sieťových služieb"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Povoliť aplikáciám v iných zariadeniach hľadať aplikácie v tomto zariadení"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Zapnúť Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Nastavenia Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnúť Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavenia Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Vybrať sieť Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Zapnúť Wi-Fi?"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Prebieha vypínanie siete Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Vybrať sieť Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Prebieha zapínanie siete Wi-Fi..."</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Prebieha vypínanie Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_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="3038290727701553612">"Oznamovať dostupné nezabezpečené siete"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Ponechať pripojenie Wi-Fi zapnuté v režime spánku"</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_scan_always_available" msgid="3470564139944368030">"Vyhľadávanie vždy zapnuté"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Inštalácia certifikátov"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Služby Google a ďalšie aplikácie môžu s cieľom zvýšenia presnosti a inými cieľmi vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikácie môžu vyhľadávať siete v blízkosti aj v prípade, že je sieť Wi-Fi vypnutá. Ak chcete nastavenie zmeniť, prejdite do časti Rozšírené &gt; Vyhľadávanie vždy zapnuté."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Túto správu znova nezobrazovať"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ponechať Wi-Fi zapnuté v režime spánku"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pri zmene nastavení sa vyskytol problém"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimalizácia Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimalizácia Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimalizovať spotrebu batérie pri zapnutej sieti Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Siete Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ďalšie možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Zadanie kódu WPS PIN"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Priame prip. Wi-Fi"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Vyhľadávanie"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Rozšírené"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Pripojiť k sieti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť záznam siete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ak chcete zobraziť dostupné siete, zapnite sieť Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemáte povolenie na zmenu siete Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Iná sieť..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Viac"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatické nastavenie (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Tablet potrebuje na dokončenie nastavení prístup k sieti Wi-Fi. Po nastavení môžete prepínať medzi mobilným dátovým pripojením a sieťou Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Tablet potrebuje na dokončenie nastavení prístup k sieti Wi-Fi. Po nastavení môžete prepínať medzi mobilným dátovým pripojením a sieťou Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Zobraziť rozšírené možnosti"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zabezpečené nastavenie siete Wi-Fi"</string>
+    <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Chránené nastavenie siete Wi-Fi"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
-    <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"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="8067502591043979939">"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_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_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="5754399645462924103">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Zlyhanie overenia totožnosti. Skúste to znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Bola rozpoznaná ďalšia relácia WPS. Skúste to znova o niekoľko minút."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Identifikátor SSID siete"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Zadajte identifikátor SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Zabezpečenie"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Sila signálu"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stav"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Chcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Odmietnuť"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Pripojiť"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Odstrániť"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Nepreskočiť"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"UPOZORNENIE: Operátor môže účtovať ďalšie poplatky za dáta."\n\n"Nastavenie tabletu môže vyžadovať prenos významného množstva dát."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UPOZORNENIE: Operátor môže účtovať ďalšie poplatky za dáta."\n\n"Nastavenie telefónu môže vyžadovať prenos významného množstva dát."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UPOZORNENIE: Tablet nebude môcť overiť, či je váš softvér aktuálny."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UPOZORNENIE: Telefón nebude môcť overiť, či je váš softvér aktuálny."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefón sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Rozšírené nastavenia Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčné pásmo Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UPOZORNENIE: Tablet nebude môcť overiť aktuálnosť vášho softvéru, až kým nebudete mať pripojenie k internetu."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UPOZORNENIE: Telefón nebude môcť overiť aktuálnosť vášho softvéru, až kým nebudete mať pripojenie k internetu."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefón sa k tejto sieti Wi-Fi nedokázal pripojiť."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Rozšírené nastavenia Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Frekvenčné pásmo Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Uveďte prevádzkový frekvenčný rozsah"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Pri nast. pravidiel frekv. pásma nastal problém."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Adresa MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"Server DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dĺžka sieťovej predpony"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Priame pripojenie Wi-Fi"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Informácie o zariadení"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapamätať si toto pripojenie"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Vyhľadávanie zariadení"</string>
@@ -649,17 +671,17 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušiť pozvánku?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušiť pozvánku na spojenie s klientom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Odstrániť túto skupinu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosný hotspot Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Prebieha zapínanie hotspotu..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Prebieha vypínanie hotspotu..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosný prístupový bod <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívny"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba prenosného prístupového bodu Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastaviť hotspot Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"Prenosný prístupový bod 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_failed_subtext" msgid="1484941858530919002">"Chyba hotspotu siete Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastaviť hotspot siete Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Vyzváňací tón telefónu"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudobné efekty"</string>
@@ -667,7 +689,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Predvolené zvukové upozornenie"</string>
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
-    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváňací tón"</string>
+    <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tón zvonenia"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornenie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitosť prichádzajúcich hovorov aj pre upozornenia"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Predvolené zvukové upozornenie"</string>
@@ -727,7 +749,7 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Počas prítomnosti zariadenia v doku"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vypnuté"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ak chcete nastaviť, čo sa stane, keď je telefón v doku alebo v režime spánku, zapnite funkciu Šetrič obrazovky."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kedy spustiť šetrič obrazovky"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Kedy spustiť šetrič"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Spustiť"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavenia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Sila signálu"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Sieť"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Adresa MAC siete Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Adresa MAC siete Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Adresa zariadenia Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Sériové číslo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Nie sú k dispozícii"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Názov prístupového bodu (APN) je povolený"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Názov prístupového bodu (APN) je zakázaný"</string>
     <string name="bearer" msgid="594270280031923558">"Operátor"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Typ MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Hodnota MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Odstrániť názov prístupového bodu (APN)"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nový názov prístupového bodu (APN)"</string>
     <string name="menu_save" msgid="8109345640668285399">"Uložiť"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilné siete"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja poloha"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Poloha Wi-Fi a mobilnej siete"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="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="7457348712272184793">"Poloha je určená podľa siete Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Poloha je určená podľa siete Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Satelity GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Umožniť aplikáciám na vašom tablete určovať polohu pomocou GPS"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Umožniť aplikáciám na vašom telefóne určovať polohu pomocou GPS"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Zvoľte možnosti filtra"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Všetko"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Zakázané"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Prevzaté"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spustené"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukladací priestor USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ak zakážete vstavanú aplikáciu, ostatné aplikácie nemusia fungovať správne. Vaše údaje sa taktiež odstránia."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnúť upozornenia?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ak v tejto aplikácii vypnete upozornenia, môžete prísť o dôležité upozornenia a aktuálne informácie."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Fungovanie aplikácií"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Spustené"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikdy nepoužité)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Využitie ukl. priestoru"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Zobraziť úložisko používané aplikáciami"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spustené služby"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Slovo:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Skratka:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jazyk:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Zadajte slovo"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Voliteľná skratka"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Upraviť slovo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Upraviť"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Odstrániť"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavenia fyzickej klávesnice"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Možnosti pre vývojárov"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Možnosti nastavenia vývoja aplikácií"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Pre tohto používateľa sú možnosti vývojára nedostupné"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ladenie USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Povoliť režim ladenia s pripojeným zariadením USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Odvolanie autorizácií na ladenie USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Nahlasovať chyby z hlavnej ponuky"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"V hlavnej ponuke zahrnúť možnosť na vytvorenie správy o chybe"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Nezamykať obrazovku"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
     <string name="adb_warning_message" msgid="7316799925425402244">"Ladenie USB je určené iba na účely vývoja. Použite ho na kopírovanie údajov 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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Povoliť nastavenia pre vývojárov?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Tieto nastavenia sú určené len pre vývojárov. Môžu spôsobiť poruchu alebo nesprávne fungovanie zariadenia a nainštalovaných aplikácií."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Overiť apl. inštalované cez USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tlačidlo Napájanie ukončuje hovor"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Hovorené heslá"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Oneskorenie dotyku a podržania"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Zjednodušenie prístupu k webu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavenia"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Zapnuté"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Vypnuté"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Povolené"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Nie je povolené"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Povoliť"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Nepovoliť"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Použiť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Služba na zjednodušenie ovládania <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zaznamenáva všetok text, ktorý napíšete, okrem hesiel. To zahŕňa osobné údaje, ako sú čísla kreditných kariet. Zaznamenáva aj údaje o interakcii so zariadením."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Služba na zjednodušenie ovládania <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> zaznamenáva všetok text, ktorý napíšete, okrem hesiel. To zahŕňa osobné údaje, ako sú čísla kreditných kariet. Zaznamenáva aj údaje o využívaní telefónu."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Zastaviť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Ak sa dotknete klávesu OK, služba <xliff:g id="SERVICE">%1$s</xliff:g> sa zastaví."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Sledovať vaše akcie"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Dostávajte upozornenia aj pri interakcii s aplikáciami."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Zastaviť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Ak sa dotknete klávesu OK, služba <xliff:g id="SERVICE">%1$s</xliff:g> sa zastaví."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nie sú nainštalované žiadne služby"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete čítačku obrazovky?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Aplikácia Talkback poskytuje hovorenú odozvu na pomoc nevidomým a slabozrakým používateľom. Chcete si túto aplikáciu bezplatne nainštalovať zo služby Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Chcete, aby aplikácie prevzali zo služby Google skripty, ktoré uľahčia prístup k ich obsahu?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"K dispozícii nie je žiadny popis."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavenia"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batéria"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nabíjanie"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Obrazovka zapnutá"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS aktívne"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Prebudiť"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilnej siete"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Doba prevádzky siete Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Doba prevádzky siete Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g> <xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
     <string name="details_title" msgid="3792801565213935385">"Podrobnosti používania"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Upraviť spotrebu energie"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Zahrnuté balíčky"</string>
     <string name="power_screen" msgid="3023346080675904613">"Obrazovka"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Telefón v pohotovostnom režime"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU v popredí"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Zakázať režim spánku"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Pripojenie Wi-Fi aktívne"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Pripojenie Wi-Fi aktívne"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefón"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Odoslané údaje"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Informácie o aplikácii"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavenia aplikácie"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavenia obrazovky"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavenia Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavenia Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavenia Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Využitie batérie hlasovými hovormi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Využitie batérie v stave nečinnosti tabletu"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"V oblastiach bez pokrytia prepnite do režimu V lietadle"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Využitie batérie obrazovkou a podsvietením"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Znížte jas obrazovky alebo interval vypnutia obrazovky"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Využitie batérie sieťou Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Vypnite pripojenie Wi-Fi, keď sa nepoužíva, alebo keď nie je k dispozícii"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Využitie batérie sieťou Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Vypnite pripojenie Wi-Fi, keď sa sieť Wi-Fi nepoužíva alebo keď nie je k dispozícii"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Využitie batérie technológiou Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Keď technológiu Bluetooth nepoužívate, vypnite ju"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Skúste sa pripojiť k inému zariadeniu Bluetooth"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurovať"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Zvoliť iný nástroj"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Nástroj na syntézu reči môže zhromažďovať všetok hovorený text, vrátane osobných údajov, ako sú heslá alebo čísla kreditných kariet. Je založený na nástroji <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Chcete aktivovať nástroj na syntézu reči?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"V prípade tohto jazyka je na prevod textu na rečový výstup potrebné pripojenie k sieti."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Moduly"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavenia <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Možnosť <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je aktivovaná"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Preferovaný nástroj"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Všeobecné"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Ovládanie napájania"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Prebieha aktualizácia nastavenia Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Prebieha aktualizácia nastavenia Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Prebieha aktualizácia nastavenia Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"zapnuté"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"vypnuté"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"zapínanie"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"vypínanie"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synchronizácia"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrániť všetky certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Dôveryhodné poverenia"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobraziť dôveryhodné certifikáty CA"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Typ ukladacieho priestoru"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardvérový"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Iba softvérový"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nakreslite bezpečnostný vzor"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohovať a obnoviť"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobné údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje údaje"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Zálohovať údaje aplikácií, heslá sietí Wi-Fi a ďalšie nastavenia na serveroch Google"</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="auto_restore_title" msgid="5397528966329126506">"Automatické obnovenie"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nové heslo a potvrdenie sa nezhodujú"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Nastavenie záložného hesla zlyhalo"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Chcete zastaviť zálohovanie hesiel sietí Wi-Fi, záložiek, ďalších nastavení a údajov aplikácií a vymazať všetky kópie na serveroch Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Chcete zastaviť zálohovanie hesiel sietí Wi-Fi, záložiek, ďalších nastavení a údajov aplikácií a vymazať všetky kópie na serveroch Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavenia správy zariadení"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Správca zariadení"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Deaktivovať"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Upozornenia"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Tón zvonenia a vibrovanie"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Systém"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Nastavenie Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Pripojiť k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Prebieha pripájanie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Nastavenie Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Pripojenie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Prebieha pripájanie k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Pridať sieť"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Nepripojené"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Pridať sieť"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Pripája sa..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Prejsť na ďalší krok"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Protokol EAP nie je podporovaný."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi-Fi cez protokol EAP. Po inštalácii to môžete vykonať v Nastaveniach &gt; Bezdrôtové pripojenie a siete."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Počas inštalácie nie je možné konfigurovať pripojenie k sieti Wi-Fi cez protokol EAP. Po inštalácii to môžete vykonať v sekcii Nastavenia &gt; Bezdrôtové pripojenie a siete."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Pripájanie môže trvať niekoľko minút..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>"."\n\n"Ak sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>"."\n\n"Ak sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizácie"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Apl. na ladenie čaká na pripojenie lad. nástroja"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Vstup"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Kresba"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Vykresľovnanie akcelerované hardvérom"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorovanie"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Prísny režim bol povolený"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Blikanie pri dlhých operáciách hlavného vlákna"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od najlepš. k najhorš.: modr., zel., sv. červ., červ."</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Zakázať hardvér. prekrytia"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať jednotku GPU na skladanie obrazovky"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Povoliť sledovania"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Vybrať povolené sledovania"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Momentálne nie sú povolené žiadne sledovania"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Počet aktuálne povolených sledovaní: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Všetky sledovania sú v súčasnosti povolené"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Povoliť trasovanie OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Zobraziť hranice rozlož."</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Zobraziť v klipe ohraničenie, okraje a pod."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Vynútiť použitie jednotky GPU na vykresľovanie 2D"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Vynútiť 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Povoliť 4x MSAA v aplikáciách OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Ladiť operácie neobdĺžnikových klipov"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profilové vykresľ. GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Merať čas vykresľov. v adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Mierka animácie okna"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limit procesov na pozadí"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Zobraziť všetky ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Zobraziť dialógové okno Aplikácia neodpovedá (ANR) pre aplikácie na pozadí"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Použiť skúšob. web. zobr."</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplikácia bude používať najnov. (Beta) web. zobr."</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Využitie dát"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítania dát"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dátové služby pri roamingu"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Obmedzenie dátových prenosov na pozadí"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Samostatné použitie 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Zobraziť využitie siete Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Zobraziť využitie Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Zobraziť využitie siete Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobilné hotspoty"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatická synchronizácia údajov"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nastaviť dát. limit mobil. sietí"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastaviť dátový limit siete 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Nastaviť dát. limit sietí 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Nastaviť dát. limit sietí Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nastaviť dát. limit Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho tabletu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Po dosiahnutí stanoveného limitu bude vaše mobilné dátové pripojenie zakázané."\n\n"Keďže sa využitie dát meria pomocou vášho telefónu a operátor môže využitie dát účtovať inak, zvážte nastavenie nižšieho limitu."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť údaje na pozadí?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ak obmedzíte mobilné údaje na pozadí, niektoré aplikácie a služby nebudú fungovať, pokiaľ nebudete mať pripojenie k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."\n\n"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornenie"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="12">"limit:"</font>\n<font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstránené aplikácie"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: podľa meraní tabletu využitých asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor môže využitie dát účtovať inak."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: podľa meraní telefónu využitých asi <xliff:g id="TOTAL">%1$s</xliff:g>. Operátor môže využitie dát účtovať inak."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilné hotspoty"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Vyberte siete Wi-Fi, ktoré sú mobilnými hotspotmi. Aplikáciám na pozadí môže byť používanie týchto sietí zakázané. Aplikácie môžu tiež pred preberaním veľkých súborov pomocou týchto sietí zobraziť upozornenie."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Vyberte siete Wi-Fi, ktoré sú mobilnými hotspotmi. Aplikáciám na pozadí môže byť používanie týchto sietí zakázané. Aplikácie môžu tiež pred preberaním veľkých súborov pomocou týchto sietí zobraziť upozornenie."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilné siete"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Siete Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ak chcete vybrať mobilné hotspoty, zapnite pripojenie k sieti  Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Siete Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Ak chcete vybrať mobil. hotspoty, zapnite pripoj. k sieti Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Tiesňové volanie"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Späť na hovor"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Názov"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Mierne"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Prísne"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Používatelia"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Vy"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Ďalší používatelia"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Pridať používateľa"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktívne"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktívne"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Používatelia a profily"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Pridať používateľa alebo profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Obmedzený profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ak chcete vytvoriť profil s obmedzeniami, najprv musíte nastaviť uzamknutie obrazovky na ochranu aplikácií a osobných údajov."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nastaviť uzamknutie"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Nenastavené"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Nie je nastavený – obmedzený profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Vlastník"</string>
+    <string name="user_you" msgid="1639158809315025986">"Vy (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Prezývka"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Pridať"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Používatelia majú svoje vlastné aplikácie a obsah"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Môžete obmedziť prístup k aplikáciám a obsahu z vášho účtu"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Používateľ"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Obmedzený profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Pridať nového používateľa"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Toto zariadenie môžete zdieľať aj s inými ľuďmi. Stačí vytvoriť ďalších používateľov. Každý používateľ má svoj vlastný priestor, ktorý si môže prispôsobiť pomocou aplikácií, tapety a pod. Používatelia si môžu prispôsobiť aj nastavenia tabletu, ktoré majú vplyv na ostatných (napr. nastavenia siete Wi-Fi)."\n\n"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Ktorýkoľvek používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Toto zariadenie môžete zdieľať aj s inými ľuďmi. Stačí vytvoriť ďalších používateľov. Každý používateľ má svoj vlastný priestor, ktorý si môže prispôsobiť pomocou aplikácií, tapety a pod. Používatelia si môžu prispôsobiť aj nastavenia tabletu, ktoré majú vplyv na ostatných (napr. nastavenia siete Wi-Fi)."\n\n"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Každý používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Keď vytvoríte nového používateľa, táto osoba musí prejsť procesom nastavenia."\n\n"Ktorýkoľvek používateľ môže akceptovať aktualizované povolenia aplikácií v mene všetkých ostatných používateľov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Chcete teraz nastaviť používateľa?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Uistite sa, že je príslušná osoba k dispozícii, aby mohla na tablete nastaviť svoj priestor"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Nastaviť profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Nastaviť teraz"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Teraz nie"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Používateľov môže spravovať iba vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Používateľov môže spravovať iba vlastník telefónu."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profily s obmedzeniami nemôžu pridávať účty"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Odstrániť <xliff:g id="USER_NAME">%1$s</xliff:g> zo zariadenia"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový používateľ"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete odstrániť svoj profil?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Odstrániť používateľa?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Chcete odstrániť profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Prídete o miesto v pamäti a údaje v tomto tablete. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Prídete o miesto v pamäti a údaje v tomto telefóne. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Miesto v pamäti a údaje používateľa sa z tabletu odstránia. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Miesto v pamäti a údaje používateľa sa z telefónu odstránia. Táto akcia sa nedá vrátiť späť."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Z tabletu sa odstráni miesto v pamäti a údaje profilu. Táto akcia sa nedá vrátiť späť."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Z telefónu sa odstráni miesto v pamäti a údaje profilu. Táto akcia sa nedá vrátiť späť."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Pridáv. nového používateľa..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Odstrániť používateľa"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Odstrániť"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Toto nastavenie ovplyvní všetkých používateľov tohto tabletu."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Toto nastavenie ovplyvní všetkých používateľov tohto telefónu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Zmeniť jazyk"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasielanie správ v rámci bunky"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy tiesňových upozornení, ktoré sa majú zobraziť."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Obmedzenia aplikácií a obsahu"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PREMENOVAŤ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nastaviť obmedzenia aplikácie"</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ôže pristupovať k vašim účtom"</string>
+    <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Siete Wi-Fi a mobilné siete"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Povoliť úpravu nastavení sietí Wi-Fi a mobilných sietí"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Povoliť úpravy párovania a nastavení rozhrania Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Prístup k polohe"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Povoliť aplikáciám používať informácie o polohe"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Späť"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Ďalej"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Dokončiť"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Vytvoriť fotografiu"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrať fotografiu z Galérie"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index f229d76..d31eb74 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Počasna"</item>
     <item msgid="1145554631248513562">"Običajna"</item>
     <item msgid="7553665153391107454">"Hitra"</item>
-    <item msgid="2538100882620724753">"Zelo hitra"</item>
+    <item msgid="1370673569131070146">"Hitreje"</item>
+    <item msgid="4648206845228970803">"Zelo hitro"</item>
+    <item msgid="4977949754169483251">"Naglo"</item>
+    <item msgid="6106302964845503577">"Zelo naglo"</item>
+    <item msgid="6800277205640837264">"Najhitreje"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Zelo nizek"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Brez"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brez"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Neopredeljeno"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Brez"</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">"Notranji pomnilnik naprave"</item>
     <item msgid="3738430123799803530">"Izmenljiva kartica SD"</item>
     <item msgid="4498124044785815005">"Naj odloči sistem"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Lokacija"</item>
+    <item msgid="255608127647030286">"Osebno"</item>
+    <item msgid="4588829735729884491">"Sporočila"</item>
+    <item msgid="8971765125227378270">"Naprava"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"groba lokacija"</item>
+    <item msgid="5789673140227507995">"natančna lokacija"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibriranje"</item>
+    <item msgid="3434165993711230924">"branje stikov"</item>
+    <item msgid="616161687718081936">"spreminjanje stikov"</item>
+    <item msgid="7638002295329050091">"branje dnevnika klicev"</item>
+    <item msgid="6546959730920410907">"spreminjanje dnevnika klicev"</item>
+    <item msgid="446877710771379667">"branje koledarja"</item>
+    <item msgid="7674458294386319722">"spreminjanje koledarja"</item>
+    <item msgid="8281201165558093009">"iskanje omrežij Wi-Fi"</item>
+    <item msgid="8694611243479480497">"obvestilo"</item>
+    <item msgid="7776439107987345446">"iskanje celic mobilnega omrežja"</item>
+    <item msgid="514615766544675057">"klicanje telefonske številke"</item>
+    <item msgid="8181415497109310680">"branje sporočil SMS"</item>
+    <item msgid="6816551144382117307">"pisanje sporočil SMS"</item>
+    <item msgid="4600463921908905030">"prejemanje sporočil SMS"</item>
+    <item msgid="5958926493289432745">"prejemanje sporočil SMS v sili"</item>
+    <item msgid="4945269495221089540">"prejemanje sporočil MMS"</item>
+    <item msgid="5570472453573929087">"prejemanje potisnih sporočil WAP"</item>
+    <item msgid="7125408150230860501">"pošiljanje sporočil SMS"</item>
+    <item msgid="7080337936612188061">"branje sporočil SMS na kartici SIM"</item>
+    <item msgid="587124103118495063">"pisanje sporočil SMS na kartici SIM"</item>
+    <item msgid="2320577158869025503">"spreminjanje nastavitev"</item>
+    <item msgid="1545733463471924009">"vlečenje na vrh"</item>
+    <item msgid="3609046903962454582">"dostop do obvestil"</item>
+    <item msgid="4671646036128214513">"fotoaparat"</item>
+    <item msgid="1097324338692486211">"snemanje zvoka"</item>
+    <item msgid="5031552983987798163">"predvajanje zvoka"</item>
+    <item msgid="8374996688066472414">"preberi odložišče"</item>
+    <item msgid="3045529469061083747">"spremeni odložišče"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokacija"</item>
+    <item msgid="8677040780775113033">"Lokacija"</item>
+    <item msgid="1660743989948992916">"Lokacija"</item>
+    <item msgid="8791172739860195290">"Vibriranje"</item>
+    <item msgid="383413555642128046">"Branje stikov"</item>
+    <item msgid="3654594895269697313">"Spreminjanje stikov"</item>
+    <item msgid="7928393476362362538">"Branje dnevnika klicev"</item>
+    <item msgid="6248591205254641116">"Spreminjanje dnevnika klicev"</item>
+    <item msgid="6093344633066170692">"Branje koledarja"</item>
+    <item msgid="1334886368750347692">"Spreminjanje koledarja"</item>
+    <item msgid="1638204101698708656">"Lokacija"</item>
+    <item msgid="2154671955760380322">"Objava obvestila"</item>
+    <item msgid="4282477730595931828">"Lokacija"</item>
+    <item msgid="4891423912898525905">"Klicanje telefonske številke"</item>
+    <item msgid="626463821668200388">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Pošiljanje sporočil SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Pošiljanje sporočil SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Prejemanje sporočil SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Pošiljanje sporočil SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Spreminjanje nastavitev"</item>
+    <item msgid="736541391767350377">"Vlečenje na vrh"</item>
+    <item msgid="5530815681721654194">"Dostop do obvestil"</item>
+    <item msgid="781213371706962767">"Fotoaparat"</item>
+    <item msgid="1720492593061838172">"Snemanje zvoka"</item>
+    <item msgid="3493046322001257041">"Predvajanje zvoka"</item>
+    <item msgid="136815868796597058">"Preberi odložišče"</item>
+    <item msgid="5238692940326972503">"Spremeni odložišče"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kratko"</item>
     <item msgid="2560532955514699713">"Srednja"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafika)"</item>
     <item msgid="1340692776955662664">"Pri napaki glGetError kliči sklad"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Izklopljeno"</item>
+    <item msgid="675719912558941285">"Izris obm. nepravok. izreza z modro"</item>
+    <item msgid="1064373276095698656">"Ozn. presk. risal. ukazov z zeleno"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Izklopljeno"</item>
+    <item msgid="2751513398307949636">"Na zaslonu kot vrstice"</item>
+    <item msgid="8272260411216018353">"Na zaslonu kot črte"</item>
+    <item msgid="120512413928262547">"V gfxinfo dumpsys lupine adb"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardna omejitev"</item>
     <item msgid="4071574792028999443">"Ni postopkov v ozadju"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8de6323..827593a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Način za letalo"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Več ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Brezžično in omrežja"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Upravljanje brezžičnih funkcij in funkcij Bluetooth, načina za letalo, mobilnih omrežij in omrežij VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Upravljajte Wi‑Fi, Bluetooth, način za letalo, mobilna omrežja in omrežja VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Podatkovno gostovanje"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Med gostovanjem vzpostavi povezavo s podatkovnimi storitvami"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Vnesite besedilo za prikaz na zaslonu za zaklepanje"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaži podatke o uporabniku na zaklenjenem zaslonu"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podatki o uporabniku"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Pokaži podatke o profilu na zaklenjenem zaslonu"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Podatki o profilu"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Dostop do lokacije"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Varnost"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Skrbništvo naprave"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Skrbniki naprav"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ogled ali izklop skrbnikov naprave"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Vklopi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapomni si nastavitve"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Prikaz brezžičnih naprav"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Če si želite ogledati naprave, vklopite brezžično povezavo."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Prikaz brezžičnih naprav je onemogočen, ker je Wi-Fi izklopljen."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Prikaz brezžičnih naprav je onemogočen, ker je Wi-Fi izklopljen."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Iskanje naprav"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Iskanje ..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"V bližini ni brezžičnih naprav."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Če je ta funkcija vklopljena, lahko vsebino iz programa prenesete v drugo napravo, ki podpira NFC, tako da napravi približate. Prenesete lahko na primer strani brskalnika, videoposnetke v YouTubu, stike iz programa Ljudje in drugo."\n\n"Približajte napravi (običajno s hrbtno stranjo) in se dotaknite zaslona. Kaj se prenese, je odvisno od programa."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Odkrivanje omrežnih storitev"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Dovoli, da aplikacije v drugih napravah odkrivajo aplikacije v tej napravi"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Brezžično"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Vklopi brezžični vmesnik"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Brezžične nastavitve"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Vklopi Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Nastavitve za Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Nastavi in upravljaj brezžične dostopne točke"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Izberite Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Vklop omrežja Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Izklapljanje vmesnika za Wi-Fi ..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Izberi Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Vklapljanje povezave Wi‑Fi …"</string>
+    <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="3038290727701553612">"Obvesti me, ko bo na voljo odprto omrežje"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izogni se slabim povezavam"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Omrežje Wi-Fi uporabi samo, če je na voljo dobra internetna povezava"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Ohrani povezavo Wi-Fi med spanjem"</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_scan_always_available" msgid="3470564139944368030">"Iskanje vedno na voljo"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Googlova lokacijska storitev in druge aplikacije naj poiščejo omrežja, tudi če je Wi-Fi izklopljen"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Namestitev potrdil"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Za večjo natančnost in druge namene dovolite Googlovi lokacijski storitvi in drugim aplikacijam, da iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Aplikacije lahko iščejo omrežja Wi-Fi v bližini, tudi če je Wi-Fi izklopljen. Če tega ne želite, odprite Dodatno &gt; Iskanje vedno na voljo."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Tega ne kaži več"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Ohrani povezavo Wi-Fi med spanjem"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Težava pri spreminjanju nastavitve"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Optimizacija Wi-Fi-ja"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Zmanjšanje porabe akumulatorja, ko je Wi-Fi vklopljen"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Optimizacija Wi-Fi-ja"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Zmanjšanje porabe energije, ko je vklopljen Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj omrežje"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Brezžična omrežja"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Omrežja Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Gumb za WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Več možnosti"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Vnos kode PIN za WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Vzpostavi povezavo z omrežjem"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pozabi omrežje"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Spremeni omrežje"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Če si želite ogledati razpoložljiva omrežja, vklopite Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Iskanje omrežij Wi-Fi ..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Za prikaz razpoložljivih omrežij vklopite Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Iskanje omrežij Wi-Fi …"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nimate dovoljenja za spreminjanje omrežja Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Drugo omrežje ..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Več"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Samodej. nastavitev (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Če želite končati namestitev, mora imeti tablični računalnik dostop do povezave Wi-Fi. Po namestitvi lahko preklopite med mobilnim podatkovnim omrežjem in omrežjem Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Če želite končati namestitev, mora imeti tablični računalnik dostop do omrežja Wi-Fi. Po namestitvi lahko preklapljate med mobilnim podatkovnim omrežjem in omrežjem Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Prikaz dodatnih možnosti"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zaščitena nastavitev Wi-Fi"</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="7204827509934892103">"Pritisnite gumb »Zaščitena nastavitev za Wi-Fi« na usmerjevalniku. Morda se imenuje »WPS« ali vsebuje ta simbol."</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja največ dve minuti."</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_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="5754399645462924103">"Povezava z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> je vzpostavljena"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Vzpostavljena povezava z omrežjem Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Nastavitev WPS že poteka in lahko traja največ dve minuti"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nastavitev WPS ni uspela. Poskusite znova čez nekaj minut."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Varnostna nastavitev brezžičnega usmerjevalnika (WEP) ni podprta"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Preverjanje pristnosti ni uspelo. Poskusite znova."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Zaznana je druga seja WPS. Poskusite znova čez nekaj minut."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Omrežni SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Vnesite SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Varnost"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Moč signala"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Stanje"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Zavrni"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Vzpostavi povezavo"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Pozabi"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Ne preskoči"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"OPOZORILO: Operater vam lahko zaračuna dodatne stroške."\n\n"Nastavitev tabličnega računalnika lahko zahteva znatno omrežno dejavnost."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"OPOZORILO: Operater vam lahko zaračuna dodatne stroške."\n\n"Nastavitev telefona lahko zahteva znatno omrežno dejavnost."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"OPOZORILO: Tablični računalnik ne bo mogel preveriti, ali je vaša programska oprema posodobljena."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"OPOZORILO: Telefon ne bo mogel preveriti, ali je vaša programska oprema posodobljena."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablični računalnik se ni mogel povezati v to omrežje Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon se ni mogel povezati v to omrežje Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Napredno za Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frekvenčni pas za Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"OPOZORILO: Dokler nimate internetne povezave, tablični računalnik ne more preveriti, ali je programska oprema posodobljena."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"OPOZORILO: Dokler nimate internetne povezave, telefon ne more preveriti, ali je programska oprema posodobljena."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablični računalnik se ni mogel povezati v to omrežje Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon se ni mogel povezati v to omrežje Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Dodatne nastavitve za Wi‑Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Frekvenčni pas za Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Določite frekvenčni obseg delovanja"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Težava pri nastavitvi frekvenčnega pasu."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Naslov MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Prehod"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Dolžina predpone omrežja"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Podatki o napravi"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Zapomni si to povezavo"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Išči naprave"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite preklicati povabilo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Želite pozabiti to skupino?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Prenosna dostopna točka Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke  ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosna dostopna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g> dejavna"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Napaka prenosne brezžične dostopne dostopne točke"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastavitev dostopne točke Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> prenosna brezžična dostopna točka"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Napaka prenosne dostopne točke Wi-Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Nastavitev dostopne točke Wi-Fi"</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="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Moč signala"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Gostovanje"</string>
     <string name="status_operator" msgid="2274875196954742087">"Omrežje"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Naslov MAC za brezžično omrežje"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Naslov MAC vmesnika Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Naslov Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serijska številka"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ni na voljo"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN omogočen"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN onemogočen"</string>
     <string name="bearer" msgid="594270280031923558">"Nosilec"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Vrsta MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Vrednost MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Izbriši APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nov APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Shrani"</string>
@@ -932,7 +956,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosna dostopna točka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Internet prek Bluetootha"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Internet prek mob. napr."</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Inter. in pren. dost. toč."</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Modem/prenosna dost. točka"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Internetna povezava prek USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Povezava USB je vzpostavljena, označite za internetno povezavo prek telefona"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoč"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobilna omrežja"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Lokacija Wi-Fi in mobilnega omrežja"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Lokacija Wi-Fi-ja in mob. omr."</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="7457348712272184793">"Lokacija, ugotovljena prek omrežja Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Določanje lokacije z Wi‑Fi-jem"</string>
     <string name="location_gps" msgid="8392461023569708478">"Sateliti GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Za določanje lokacije omogočite aplikacijam uporabo GPS-a v tabličnem računalniku"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Za določanje lokacije omogočite aplikacijam uporabo GPS-a v telefonu"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtriraj"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Izberite možnosti filtriranja"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Vse"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Onemogočene"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Preneseno"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Se izvaja"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Pomnilnik USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Če onemogočite vgrajeno aplikacijo, lahko druge aplikacije napačno delujejo. Izbrisali boste tudi podatke."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Želite izklopiti obvestila?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Če izklopite obvestila za to aplikacijo, boste morda zamudili pomembna opozorila in posodobitve."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Delovanje aplikacij"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Se izvaja"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikoli uporabljeno)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Uporaba pomnilnika"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Ogled pomnilnika, ki ga uporabljajo programi"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Zagnane storitve"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Beseda:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Bližnjica:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Jezik:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Vnesite besedo"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Izbirna bližnjica"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Uredi besedo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Uredi"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Izbriši"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Nastavitve fizične tipkovnice"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Možnosti za razvijalce"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Nastavi možnosti za razvoj programov"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Možnosti razvijalca niso na voljo za tega uporabnika"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Odpravljanje težav s povezavo USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Način za odpravljanje težav, ko je vzpostavljena povezava USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Preklic dovoljenj za odpravljanje težav prek povezave USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Poročila o napakah v meniju z možnostmi za izklop/vklop"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Vključitev možnosti za poročila o napakah v meniju z možnostmi izklop/vklop"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Brez zaklepanja"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</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 programov 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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ali želite omogočiti nastavitve za razvijanje?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Te nastavitve so namenjene samo za razvijanje in lahko povzročijo prekinitev ali napačno delovanje naprave in programov v njej."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Preveri apl., namešč. z USB-jem"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Gumb za vklop konča klic"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Izgovarjanje gesel"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Časovni zam. za dotik in pridržanje"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Izbol. dostop. spleta za os. s pos. pot."</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Nastavitve"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Vklopljeno"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Izkloplj."</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Dovoljeno"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Ni dovoljeno"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Dovoli"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Ne dovoli"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> lahko zbira vse besedilo, ki ga vnesete, razen gesel. To obsega tudi osebne podatke, npr. številke kreditnih kartic. Zbira lahko tudi podatke o uporabi tabličnega računalnika."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> lahko zbira vse besedilo, ki ga vnesete, razen gesel. To obsega tudi osebne podatke, npr. številke kreditnih kartic. Zbira lahko tudi podatke o vaši uporabi telefona."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Želite ustaviti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Če se dotaknete »V redu«, onemogočite storitev <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Opazujte svoja dejanja"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Prejmite obvestila, ko uporabljate aplikacijo."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Ali želite ustaviti storitev <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Če se dotaknete »V redu«, ustavite storitev <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nameščena ni nobena storitev"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Potrebujete bralnik zaslona?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Program TalkBack daje izgovorjene povratne informacije za pomoč slepim in slabovidnim uporabnikom. Ali ga želite brezplačno namestiti iz trgovine Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ali želite, da programi namestijo skripte iz Googla, ki omogočajo širšo dostopnost njihove spletne vsebine?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ni opisa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Nastavitve"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterija"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Napajanje"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Zaslon vklopljen"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS:"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Z odklenjenim zaslonom"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilnega omrežja"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Čas odklenjenega zaslona"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Čas z vklopljenim Wi-Fi-jem"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Čas z vklopljenim Wi-Fi-jem"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Čas z vklopljenim Wi-Fi-jem"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas z vklopljenim Wi-Fi-jem"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> –  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti zgodovine"</string>
     <string name="details_title" msgid="3792801565213935385">"Uporabi podrobnosti"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Prilagodi porabo energije"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Vključeni paketi"</string>
     <string name="power_screen" msgid="3023346080675904613">"Zaslon"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Brezžično"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Stanje pripravljenosti"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ospredje CPE"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Ohrani odklenjen zaslon"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi vklopljen"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi vklopljen"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablični računalnik"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Poslani podatki"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Podatki o aplikaciji"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Nastavitve programov"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Nastavitve zaslona"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Nastavitve za Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Nastavitve za Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Nastavitve Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Energija, ki so jo porabili glasovni klici"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Uporaba baterije, ko je tablični računalnik nedejaven"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Na območjih brez mobilnega signala preklopite v način za letalo, da prihranite energijo"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Energija, porabljena za osvetlitev zaslona"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Zmanjšajte svetlost zaslona in/ali časovno omejitev za vklop zaslona"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Energija, ki jo je porabila brezžična funkcija"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Izklopi Wi-Fi, če ni v uporabi ali na voljo"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Energija, ki jo je porabil Wi‑Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Izklopite Wi-Fi, ko ga ne uporabljate ali če ni na voljo"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Energija, ki jo je porabil Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Izklopite funkcijo Bluetooth, kadar je ne uporabljate"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Poskusite vzpostaviti povezavo z drugo napravo Bluetooth"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfiguriraj"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Izberite drug mehanizem"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ta mehanizem za sintezo govora bo morda lahko zbiral izgovorjeno besedilo, vključno z osebnimi podatki, kot so gesla in številke kreditnih kartic. Omogoča ga mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Ali želite omogočiti uporabo tega mehanizma za sintezo govora?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Za pretvorbo besedila v govor potrebuje ta jezik delujočo omrežno povezavo."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mehanizmi"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Nastavitve za <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Mehanizem <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> je omogočen"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Prednostni mehanizem"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Splošno"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Nadzor porabe"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Posodabljanje brezžične nastavitve"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Posodabljanje nastavitve Wi‑Fi-ja"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Posodabljanje nastavitev Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"vklopljeno"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"izklopljeno"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"vklapljanje"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"izklapljanje"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Sinhronizacija"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrani vsa potrdila"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Preverjene poverilnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži zaupanja vredna potrdila overiteljev"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Vrsta shrambe"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Strojna"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo programska"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narišite vzorec za odklepanje"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Varnostno kopiranje in obnovitev"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osebni podatki"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Varnostno kopiraj moje podatke"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Varnostno kopiranje podatkov programov, gesel za Wi-Fi in drugih nastavitev v Googlove strežnike"</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="auto_restore_title" msgid="5397528966329126506">"Samodejna obnovitev"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Novo geslo in potrditev se ne ujemata."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Neuspela nastavitev varnostnega gesla"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Ali želite ustaviti varnostno kopiranje gesel za Wi-Fi, zaznamkov, drugih nastavitev in podatkov programov ter izbrisati vse kopije v Googlovih strežnikih?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Ali želite ustaviti varnostno kopiranje gesel za Wi-Fi, zaznamkov, drugih nastavitev in podatkov aplikacij ter izbrisati vse kopije iz Googlovih strežnikov?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Nastavitve skrbništva naprave"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Skrbnik naprave"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Izklopi"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Obvestila"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ton zvonjenja in vibriranje"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Nastavitev Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Vzpostavi povezavo z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Vzpostavljanje povezave z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Vzpostavljena povezava z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Namestitev povezave Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Vzpostavitev povezave z omrežjem Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Vzpostavljanje povezave z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> …"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Vzpostavljena povezava z omrežjem Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Dodajanje omrežja"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Povezava ni vzpostavljena"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Dodaj omrežje"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Povezovanje ..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Naprej"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP ni podprt."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Povezave EAP Wi-Fi ne morete nastaviti med namestitvijo. To lahko po namestitvi naredite v nastavitvah v razdelku »Brezžično in omrežja«."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Povezave EAP Wi-Fi ne morete nastaviti med namestitvijo. To lahko po namestitvi naredite v Nastavitve &gt; Brezžično in omrežja."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Vzpostavljanje povezave lahko traja nekaj minut ..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Če želite nadaljevati nastavitev, se dotaknite "<b>"Naprej"</b>"."\n\n"Če se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Če želite nadaljevati namestitev, se dotaknite "<b>"Naprej"</b>"."\n\n"Če se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogočena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizacija onemogočena"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Napaka pri sinhronizaciji"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Progr, kjer se išče nap., čaka isk. nap. pred izv."</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Vnos"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Risba"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Upodabljanje s strojnim pospeševanjem"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Spremljanje"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strog način je omogočen"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Osveži zaslon pri dolgih oper. progr. v gl. niti"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Od najboljšega do najslabšega: modra, zelena, svetlo rdeča, rdeča"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Onem. strojni medp."</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Omogoči sledi"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Izbira omogočenih sledi"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Trenutno ni omogočenih sledi"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Št. trenutno omogočenih sledi: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Vse sledi so trenutno omogočene"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Omogoči sledi OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Prikaz mej postavitve"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Pokaži meje obrezovanja, obrobe ipd."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Za risanje 2D vsili uporabo grafičnega procesorja"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Vsili 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"V aplikacijah OpenGL ES 2.0 omogoči 4x MSAA"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Odpr. težav s postopki nepravokotnega izrezovanja"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Upod. profilov z GPU-jem"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Merjenje časa upodab. v dumpsys gfxinfo lupine adb"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Merilo animacije okna"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Merilo animacije prehoda"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Lestvica trajanja animacije"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Omejitev postopkov v ozadju"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Pokaži okna neodzivanj"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Prikaz pogovornega okna za neodzivanje programa v ozadju"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Uporabi poskusni WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Aplik. bodo uporabljale najnovejši WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Podatkovni promet"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cikel porabe podatkov"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Podatkovno gostovanje"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Omejitev podatkov v ozadju"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ločena uporaba 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Pokaži uporabo Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Pok. porabo pod. za Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Pokaži uporabo etherneta"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobilne dostopne točke"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Samodejno sinhroniziranje podatkov"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Nast. omejitev mobilnih podatkov"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Nastavi omejitev podatkov za 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Nast. omejitev za EDGE in UMTS"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Nast. omejitev podatkov za Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Nast. omej. pod. za Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilni"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri tablični računalnik, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Vaša mobilna podatkovna povezava bo onemogočena, ko dosežete omejitev."\n\n"Ker uporabo podatkov meri telefon, operater pa jo lahko obračunava drugače, priporočamo, da uporabite nekoliko manjšo omejitev."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite omejiti podatke v ozadju?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Če omejite prenos mobilnih podatkov v ozadju, nekateri programi in storitve ne bodo delovali, kadar niste povezani v omrežje Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Če omejite mobilne podatke v ozadju, bodo nekatere aplikacije in storitve delovale samo ob vzpostavljeni povezavi z omrežjem Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Če omejite mobilne podatke v ozadju, bodo nekatere aplikacije in storitve delovale samo ob vzpostavljeni povezavi z omrežjem Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike tega tabličnega računalnika."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Če omejite podatkovni prenos v mobilnih omrežjih v ozadju, nekatere aplikacije in storitve ne bodo delovale, kadar niste povezani v omrežje Wi-Fi."\n\n"Nastavitev vpliva na vse uporabnike tega telefona."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">" <xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"opozorilo"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"omejitev"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstranjeni programi"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: približna količina prenesenih podatkov, merjena s tabličnim računalnikom: <xliff:g id="TOTAL">%1$s</xliff:g>. Operater jo lahko obračunava drugače."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: približna količina prenesenih podatkov, merjena s telefonom: <xliff:g id="TOTAL">%1$s</xliff:g>. Operater jo lahko obračunava drugače."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobilne dostopne točke"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Izberite omrežja Wi-Fi, ki so mobilne dostopne točke. Aplikacijam v ozadju lahko omejite uporabo teh omrežij. Aplikacije vas lahko tudi opozorijo pred uporabo teh omrežij za prenos velike količine podatkov."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Izberite omrežja Wi-Fi, ki so mobilne dostopne točke. Aplikacijam v ozadju lahko omejite uporabo teh omrežij. Aplikacije vas lahko tudi opozorijo pred uporabo teh omrežij za prenos velike količine podatkov."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobilna omrežja"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Omrežja Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Če želite izbrati mobilne dostopne točke, vklopite Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Omrežja Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Če želite izbrati mobilne dostopne točke, vklopite Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Klic v sili"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Nazaj na klic"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Ime"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Dopuščajoče"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Uveljavljajoče"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Uporabniki"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Vi"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Drugi uporabniki"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Dodaj uporabnika"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiven"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Neaktiven"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Uporabniki in profili"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Dodajanje uporabnika ali profila"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Omejen profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Preden lahko ustvarite profil z omejitvami, morate nastaviti zaklepanje zaslona, da zaščitite aplikacije in osebne podatke."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Nastavi zaklepanje"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Uporabnik ni nastavljen"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Ni nastavljeno – omejen profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Lastnik"</string>
+    <string name="user_you" msgid="1639158809315025986">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Vzdevek"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Dodaj"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Uporabniki imajo svoje aplikacije in vsebino"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Dostop do aplikacij in vsebine iz vašega računa lahko omejite"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Uporabnik"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Omejen profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Dodaj novega uporabnika"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"To napravo lahko delite z drugimi, pred tem pa morate ustvariti dodatne uporabnike. Vsak uporabnik ima svoj prostor, v katerega lahko dodaja aplikacije, ozadja in drugo. Uporabniki lahko poleg tega prilagajajo nastavitve tabličnega računalnika, ki vplivajo tudi na druge uporabnike, na primer Wi-Fi."\n\n"Ko ustvarite novega uporabnika, mora slednji opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme nova dovoljenja za aplikacije v imenu vseh ostalih uporabnikov."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"To napravo lahko delite z drugimi, pred tem pa morate ustvariti dodatne uporabnike. Vsak uporabnik ima svoj prostor, ki ga lahko prilagaja z dodajanjem aplikacij, ozadij in drugih elementov. Uporabniki lahko poleg tega prilagajajo nastavitve tabličnega računalnika, ki vplivajo tudi na druge uporabnike, na primer Wi-Fi."\n\n"Ko ustvarite novega uporabnika, mora ta oseba opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme posodobljena dovoljenja za aplikacije v imenu vseh drugih uporabnikov."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Ko ustvarite novega uporabnika, mora slednji opraviti postopek namestitve."\n\n"Vsak uporabnik lahko sprejme nova dovoljenja za aplikacije v imenu vseh ostalih uporabnikov."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Želite uporabnika nastaviti zdaj?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Prepričajte se, da ima oseba čas za nastavitev svojega prostora v tabličnem računalniku"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Želite zdaj nastaviti profil?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Želim nastaviti zdaj"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Ne zdaj"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Uporabnike lahko upravlja samo lastnik tabličnega računalnika."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Uporabnike lahko upravlja samo lastnik telefona."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profili z omejitvami ne morejo dodajati računov"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbris up. <xliff:g id="USER_NAME">%1$s</xliff:g> iz napr."</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nov uporabnik"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Nov profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite izbrisati sebe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Želite odstr. uporabnika?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Želite odstraniti profil?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"V tem tabličnem računalniku boste izgubili prostor in podatke. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"V tem telefonu boste izgubili prostor in podatke. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Prostor in podatki tega uporabnika bodo izginili iz tega tabličnega računalnika. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Prostor in podatki tega uporabnika bodo izginili iz tega telefona. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Prostor in podatki tega profila bodo izginili iz tabličnega računalnika. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Prostor in podatki tega profila bodo izginili iz telefona. Tega dejanja ni mogoče razveljaviti."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Dodajanje novega uporabnika ..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Izbriši uporabnika"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Izbriši"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Nastavitev vpliva na vse uporabnike v tem tabličnem računalniku."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nastavitev vpliva na vse uporabnike v tem telefonu."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Spremenjen jezik"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Oddaje v celici"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Izberite vrste nujnih opozoril, ki jih želite prikazati."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Omejitve za aplikacije in vsebino"</string>
+    <string name="user_rename" msgid="8523499513614655279">"PREIMENOVANJE"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Nastavitev omejitev za aplikacije"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Dovoli spreminjanje seznanjanj in nastavitev naprav Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Dovoli izmenjavo podatkov, ko se tablični računalnik dotakne druge naprave"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Dovoli izmenjavo podatkov, ko se telefon dotakne druge naprave"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Dostop do lokacije"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Aplikacije lahko uporabljajo podatke o vaši lokaciji"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Nazaj"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Naprej"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Dokončaj"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Posnemi fotografijo"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Izberite fotografijo iz galerije"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 36a9cfb..8552560 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Полако"</item>
     <item msgid="1145554631248513562">"Нормалан"</item>
     <item msgid="7553665153391107454">"Брзо"</item>
-    <item msgid="2538100882620724753">"Веома брзо"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Ниједно"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ништа"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Није наведено"</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">"Складиште унутрашњег уређаја"</item>
     <item msgid="3738430123799803530">"Уклоњива SD картица"</item>
     <item msgid="4498124044785815005">"Нека систем одлучи"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Локација"</item>
+    <item msgid="255608127647030286">"Лично"</item>
+    <item msgid="4588829735729884491">"Размена порука"</item>
+    <item msgid="8971765125227378270">"Уређај"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"оквирна локација"</item>
+    <item msgid="5789673140227507995">"прецизна локација"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"вибрација"</item>
+    <item msgid="3434165993711230924">"читање контаката"</item>
+    <item msgid="616161687718081936">"мењање контаката"</item>
+    <item msgid="7638002295329050091">"читање евиденције позива"</item>
+    <item msgid="6546959730920410907">"мењање евиденције позива"</item>
+    <item msgid="446877710771379667">"читање календара"</item>
+    <item msgid="7674458294386319722">"мењање календара"</item>
+    <item msgid="8281201165558093009">"Wi-Fi скенирање"</item>
+    <item msgid="8694611243479480497">"обавештење"</item>
+    <item msgid="7776439107987345446">"скенирање телефона"</item>
+    <item msgid="514615766544675057">"позивање телефона"</item>
+    <item msgid="8181415497109310680">"читање SMS порука"</item>
+    <item msgid="6816551144382117307">"писање SMS порука"</item>
+    <item msgid="4600463921908905030">"пријем SMS порука"</item>
+    <item msgid="5958926493289432745">"пријем хитних SMS порука"</item>
+    <item msgid="4945269495221089540">"пријем MMS порука"</item>
+    <item msgid="5570472453573929087">"пријем push порука преко WAP-а"</item>
+    <item msgid="7125408150230860501">"слање SMS порука"</item>
+    <item msgid="7080337936612188061">"читање ICC SMS порука"</item>
+    <item msgid="587124103118495063">"писање ICC SMS порука"</item>
+    <item msgid="2320577158869025503">"мењање подешавања"</item>
+    <item msgid="1545733463471924009">"повлачење на врх"</item>
+    <item msgid="3609046903962454582">"приступ обавештењима"</item>
+    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="1097324338692486211">"снимање аудио записа"</item>
+    <item msgid="5031552983987798163">"пуштање аудио записа"</item>
+    <item msgid="8374996688066472414">"читање меморије"</item>
+    <item msgid="3045529469061083747">"мењање меморије"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Локација"</item>
+    <item msgid="8677040780775113033">"Локација"</item>
+    <item msgid="1660743989948992916">"Локација"</item>
+    <item msgid="8791172739860195290">"Вибрација"</item>
+    <item msgid="383413555642128046">"Читање контаката"</item>
+    <item msgid="3654594895269697313">"Мењање контаката"</item>
+    <item msgid="7928393476362362538">"Читање евиденције позива"</item>
+    <item msgid="6248591205254641116">"Мењање евиденције позива"</item>
+    <item msgid="6093344633066170692">"Читање календара"</item>
+    <item msgid="1334886368750347692">"Мењање календара"</item>
+    <item msgid="1638204101698708656">"Локација"</item>
+    <item msgid="2154671955760380322">"Постављање обавештења"</item>
+    <item msgid="4282477730595931828">"Локација"</item>
+    <item msgid="4891423912898525905">"Позивање телефона"</item>
+    <item msgid="626463821668200388">"Пријем SMS/MMS порука"</item>
+    <item msgid="1237538540368797101">"Слање SMS/MMS порука"</item>
+    <item msgid="3986142739951490025">"Пријем SMS/MMS порука"</item>
+    <item msgid="3984213795861739778">"Пријем SMS/MMS порука"</item>
+    <item msgid="3656243523752472788">"Пријем SMS/MMS порука"</item>
+    <item msgid="8105802370238551510">"Пријем SMS/MMS порука"</item>
+    <item msgid="1407766984645388488">"Слање SMS/MMS порука"</item>
+    <item msgid="1530132603376027248">"Пријем SMS/MMS порука"</item>
+    <item msgid="1188256962149204607">"Слање SMS/MMS порука"</item>
+    <item msgid="4218544235221631789">"Мењање подешавања"</item>
+    <item msgid="736541391767350377">"Повлачење на врх"</item>
+    <item msgid="5530815681721654194">"Приступ обавештењима"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Снимање аудио записа"</item>
+    <item msgid="3493046322001257041">"Пуштање аудио записа"</item>
+    <item msgid="136815868796597058">"Читање меморије"</item>
+    <item msgid="5238692940326972503">"Мењање меморије"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Кратко"</item>
     <item msgid="2560532955514699713">"Средње"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (графика)"</item>
     <item msgid="1340692776955662664">"Групно позивање функције glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"На екрану у виду трака"</item>
+    <item msgid="8272260411216018353">"На екрану у виду линија"</item>
+    <item msgid="120512413928262547">"У adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандардно ограничење"</item>
     <item msgid="4071574792028999443">"Без позадинских процеса"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 70b6d8b..857c4fa 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Режим рада у авиону"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Још…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бежична веза и мреже"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
     <string name="roaming" msgid="3596055926335478572">"Пренос података у ромингу"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Повезивање са услугом за податке током роминга"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Повезивање са услугом за податке током роминга"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Унесите текст за приказ на екрану за закључавање"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Прикажи информације о кориснику на закљ. екрану"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Подаци о кориснику"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Прикажи податке о профилу на закључаном екрану"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Подаци о профилу"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Приступ локацији"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Администрација уређаја"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Администратори уређаја"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Преглед или деактивирање администратора уређаја"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Приступ обавештењима"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Укључи Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запамти подешавања"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Бежични екран"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Да бисте видели уређаје, укључите бежични екран."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Бежични екран је онемогућен јер је Wi-Fi искључен."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бежични екран је онемогућен јер је Wi-Fi искључен."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Тражење екрана"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Претраживање..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Нису пронађени бежични екрани у близини."</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Укључивање Wi-Fi мреже"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi подешавања"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Укључивање Wi-Fi-ја"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi подешавања"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Подешавање и управљање бежичним приступним тачкама"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Избор Wi-Fi мреже"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Укључивање Wi-Fi-ја…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Искључивање Wi-Fi мреже…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Избор Wi-Fi мреже"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Укључивање Wi-Fi-ја..."</string>
+    <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="3038290727701553612">"Обавести ме када је отворена мрежа доступна"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Избегавај лоше везе"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не користи Wi-Fi мрежу осим ако иста има добру интернет везу"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Не искључуј Wi-Fi током стања спавања"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не користи Wi-Fi мрежу ако нема добру интернет везу"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Скенирање је увек доступно"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Дозволите Google-овој услузи лоцирања и другим апликацијама да скенирају мреже, чак и када је Wi-Fi искључен"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Инсталирај сертификате"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Да би, између осталог, побољшале тачност локације, Google и друге апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Апликације могу да скенирају оближње мреже, чак и када је Wi-Fi искључен. Ако не желите да се то дешава, идите на Напредно &gt; Скенирање је увек доступно."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Не приказуј поново"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Не искључуј Wi-Fi током спавања"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Дошло је до проблема приликом промене подешавања"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi оптимизација"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Смањи коришћење батерије када је Wi-Fi укључен"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi оптимизација"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Смањи коришћење батерије када је Wi-Fi укључен"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додај мрежу"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мреже"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi мреже"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS дугме"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Још опција"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Унос WPS PIN-а"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Повежи са мрежом"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Заборави мрежу"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Измени мрежу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Да бисте видели доступне мреже, укључите Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Тражење Wi-Fi мрежа..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Да бисте видели доступне мреже, укључите Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Тражење Wi-Fi мрежа..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Немате дозволу да мењате Wi‑Fi мрежу."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Друга мрежа..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Још"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Аутоматско подешавање (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Да бисте довршили подешавање, таблет треба да има приступ Wi-Fi мрежи. Након подешавања, можете да прелазите са мобилне мреже на Wi-Fi и обратно."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Да бисте довршили подешавање, таблет мора да има приступ Wi-Fi-ју. Након подешавања можете да прелазите са мобилне мреже на Wi-Fi и обрнуто."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Прикажи напредне опције"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање Wi-Fi-ја"</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="7204827509934892103">"Притисните дугме Заштићено подешавање Wi-Fi-ја на рутеру. Можда се зове „WPS“ или садржи овај симбол:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Унесите PIN <xliff:g id="NUMBER">%1$s</xliff:g> на Wi-Fi рутеру. Подешавање ће бити довршено за највише два минута."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Притисните дугме Заштићено подешавање 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="5754399645462924103">"Повезано са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS је већ покренут и биће довршен за највише два минута"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS није успео. Покушајте поново за неколико минута."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безбедносно подешавање бежичног рутера (WEP) није подржано"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Потврда аутентичности није успела. Покушајте поново."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Откривена је друга WPS сесија. Покушајте поново за неколико минута."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Мрежни SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Унесите SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безбедност"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Јачина сигнала"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Статус"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Одбиј"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Повежи"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Повезивање са мрежом није успело"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Заборави"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Не прескачи"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"УПОЗОРЕЊЕ: Можете да изазовете додатне трошкове оператера за пренос података."\n\n"Подешавање таблета може да захтева значајну активност на мрежи."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"УПОЗОРЕЊЕ: Можете да изазовете додатне трошкове оператера за пренос података."\n\n"Подешавање телефона може да захтева значајну активност на мрежи."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"УПОЗОРЕЊЕ: Таблет неће моћи да верификује да је софтвер ажуриран."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"УПОЗОРЕЊЕ: Телефон неће моћи да верификује да је софтвер ажуриран."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Таблет није могао да се повеже са овом Wi-Fi мрежом."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Телефон није могао да се повеже са овом Wi-Fi мрежом."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Напредна Wi-Fi подешавања"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi опсег фреквенција"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"УПОЗОРЕЊЕ: Док не успоставите интернет везу, таблет неће моћи да верификује да је софтвер ажуриран."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"УПОЗОРЕЊЕ: Док не успоставите интернет везу, телефон неће моћи да верификује да је софтвер ажуриран."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Таблет није могао да се повеже са овом Wi-Fi мрежом."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон није могао да се повеже са овом Wi-Fi мрежом."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Напредна Wi-Fi подешавања"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi опсег фреквенција"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Наведите опсег фреквенција за операцију"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Проблем приликом подешавања опсега фреквенција."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Мрежни пролаз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Дужина префикса мреже"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Информације о уређају"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запамти ову везу"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Претражи уређаје"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Желите ли да заборавите ову групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна Wi-Fi приступна тачка"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Преносни Wi-Fi хотспот"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Укључивање хотспота…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Искључивање хотспота..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Преносна приступна тачка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активна"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка у преносној Wi-Fi приступној тачки"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Подеси Wi-Fi хотспот"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Грешка преносног Wi‑Fi хотспота"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Подеси 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="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Јачина сигнала"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Роминг"</string>
     <string name="status_operator" msgid="2274875196954742087">"Мрежа"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi Mac адреса"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC адреса"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth адреса"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серијски број"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступно"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Назив приступне тачке је омогућен"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Назив приступне тачке је онемогућен"</string>
     <string name="bearer" msgid="594270280031923558">"Носилац"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Тип MVNO-а"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Вредност MVNO-а"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Избриши назив приступне тачке"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нов назив приступне тачке"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сачувај"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Помоћ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобилне мреже"</string>
     <string name="location_title" msgid="1029961368397484576">"Мојa локацијa"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi и локација мобилне мреже"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Локац. на основу Wi-Fi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Локација се одређује помоћу Wi-Fi-ја"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Локација се одређује помоћу Wi-Fi-ја"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS сателити"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Нека апликације користе GPS на таблету како би тачно одредиле вашу локацију"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Нека апликације користе GPS на телефону како би тачно одредиле вашу локацију"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Филтрирај"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Избор опција филтера"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Све"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Онемогућено"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Преузето"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Покретање"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB меморија"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ако онемогућите уграђену апликацију, друге апликације ће можда неправилно функционисати. Такође, подаци ће бити избрисани."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Желите ли да искљ. обавештења?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ако искључите обавештења за ову апликацију, можете да пропустите важна обавештења и ажурирања."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Операције апликација"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Активно"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Никада није коришћено)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Коришћење меморије"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Преглед искоришћене меморије по апликацијама"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Покренуте услуге"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Реч:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Пречица:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Језик:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Унесите реч"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Опционална пречица"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Измена речи"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Измени"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Избриши"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Подешавања физичке тастатуре"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Опције за програмера"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Подешавање опција за програмирање апликације"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Опције за програмере нису доступне за овог корисника"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Отклањање USB грешака"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим отклањања грешака када је USB повезан"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Опозивање одобрења за уклањање USB грешака"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Извештаји о грешкама у менију напајања"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Омогућите опцију за прављење извештаја о грешкама у менију напајања"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Не закључавај"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Желите ли да омогућите програмерска подешавања?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ова подешавања су намењена само за програмирање. Могу да изазову престанак функционисања или неочекивано понашање уређаја и апликација на њему."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Верификуј апликације преко USB-а"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Дугме укључи/искључи прекида позив"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Изговарај лозинке"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Одлагање додира и задржавањa"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Побољшај веб приступачност"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Подешавања"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Укључено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Искључено"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дозвољено"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Није дозвољено"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дозволи"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Не дозволи"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Желите ли да користите услугу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> може да прикупља сав текст који унесете, изузев лозинки. Ту спадају лични подаци као што су бројеви кредитних картица. Услуга може да прикупља и податке о интеракцијама са таблетом."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> може да прикупља сав текст који унесете, изузев лозинки. Ту спадају лични подаци као што су бројеви кредитних картица. Услуга може да прикупља и податке о интеракцијама са телефоном."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Желите ли да онемогућите услугу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Ако додирнете Потврди, онемогућићете услугу <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Праћење ваших радњи"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Добија обавештења када остварујете интеракцију са апликацијом."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Желите ли да зауставите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Додиром на Потврди онемогућавате <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ниједна услуга није инсталирана"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потребан вам је читач екрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack пружа говорне повратне информације како би помогао слепим корисницима и корисницима са слабим видом. Да ли желите да га бесплатно инсталирате са Android Market-а?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Да ли желите да апликације инсталирају скрипте из Google-а помоћу којих ће њихов веб садржај постати приступачнији?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Није наведен опис."</string>
     <string name="settings_button" msgid="3006713718908152930">"Подешавања"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Батерија"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Пуњење"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Екран је укључен"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS је укључен"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Буђење"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сигнал мобилне мреже"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi на време"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi на време"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> – <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Детаљи историје"</string>
     <string name="details_title" msgid="3792801565213935385">"Коришћење детаља"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Прилагођавање коришћења напајања"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Садржани пакети"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Стање приправности телефона"</string>
     <string name="power_phone" msgid="5392641106474567277">"Гласовни позиви"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Процесор у предњем плану"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Задржи ван стања спавања"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi је активан"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi је активан"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Таблет"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Подаци су послати"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Информације о апликацији"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Подешавања апликације"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Подешавања екрана"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi подешавања"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi подешавања"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Подешавања за Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Батерија коју користе гласовни позиви"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Искоришћена батерија када је таблет неактиван"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Пређите на режим рада у авиону како би се сачувала батерија у областима без покривености мрежом"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Батерија коју користи екран и позадинско светло"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Смањите осветљеност екрана и/или време чекања екрана"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Батерија коју користи Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Искључите·Wi-Fi када га не користите или када није доступан"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Батерија коју користи Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Искључите Wi-Fi када га не користите или када није доступан"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Батерија коју користи Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Искључите Bluetooth када га не користите"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Покушајте да се повежете са другим Bluetooth уређајем"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Конфигуриши"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Изабери други уређај"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ова технологија за синтезу говора можда може да прикупља сав текст који ће бити изговорен, укључујући личне податке као што су лозинке и бројеви кредитних картица. То потиче из технологије <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Желите ли да омогућите коришћење ове технологије за синтезу говора?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"За овај језик је потребна исправна мрежна веза за претварање језика у говор."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Машине"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> подешавања"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> је омогућено"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Жељена машина"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Опште"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контрола напајања"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ажурирање Wi-Fi подешавања"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ажурирање Wi-Fi подешавања"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ажурирање Bluetooth подешавања"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> – <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"укључено"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"искључено"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"укључивање"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"искључивање"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронизација"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Уклањање свих сертификата"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Поуздани акредитиви"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Прикажи поуздане CA сертификате"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Тип складишног простора"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Подржан хардвером"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтверски"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Нацртајте шаблон за откључавање"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Прављење резервне копије и враћање"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Лични подаци"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Прављење резервних копија мојих података"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Прављење резервних копија података о апликацијама, Wi-Fi лозинки и других подешавања на Google серверима"</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="auto_restore_title" msgid="5397528966329126506">"Аутоматско враћање"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Нова лозинка и њена потврда се не подударају"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Постављање резервне лозинке није успело"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Желите ли да зауставите прављење резервних копија Wi-Fi лозинки, обележивача, осталих подешавања и података о апликацијама, као и да избришете све копије на Google серверима?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Желите ли да зауставите прављење резервних копија Wi-Fi лозинки, обележивача, осталих подешавања и података о апликацијама, као и да избришете све копије на Google серверима?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Подешавања администрације уређаја"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Администратор уређаја"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Деактивирај"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Обавештења"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Мелодија звона и вибрација позива"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Систем"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Подешавање Wi-Fi везе"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Повежи са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Повезивање са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Подешавање Wi‑Fi-ја"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Повезивање са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Повезивање са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Успостављена је веза са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Додавање мреже"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Није повезано"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Додај мрежу"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Повезивање…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Идите на следећи корак"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP није подржан."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Не можете да конфигуришете EAP Wi-Fi везу током подешавања. Након подешавања, то можете да урадите у Подешавањима &gt; Бежична веза и мреже."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Не можете да конфигуришете EAP Wi-Fi везу током подешавања. То можете да урадите након подешавања у одељку Подешавања &gt; Бежична веза и мреже."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Повезивање може да потраје неколико минута..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Додирните "<b>"Следеће"</b>" да бисте наставили са подешавањем."\n\n"Додирните "<b>"Назад"</b>" да бисте се повезали са другом Wi-Fi мрежом."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Додирните "<b>"Даље"</b>" да бисте наставили са подешавањем."\n\n"Додирните "<b>"Назад"</b>" да бисте се повезали са другом Wi‑Fi мрежом."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизација је омогућена"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизација је онемогућена"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизацији."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Аплик. чека прог. за отклањ. грешака да приложи пре извршавања"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Унос"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Цртање"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Хардверски убрзано приказивање"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Надгледање"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Омогућен је строги режим"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Нека екран трепери када апликације обављају дуге операције на главној нити"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Од најбољег ка најгорем: плаво, зелено, светлоцрвено, црвено"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Онемог. HW пост. елементе"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Омогући трагове"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Изабери омогућене трагове"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Тренутно нема омогућених трагова"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Тренутно су омогућени трагови (<xliff:g id="NUM">%1$d</xliff:g>)"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Сви трагови су тренутно омогућени"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Омогући OpenGL трагове"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Прикажи границе распореда"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Прикажи границе клипа, маргине итд."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Принудно користи GPU за 2D цртање"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Наметни 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Омогући 4x MSAA у OpenGL ES 2.0 апликацијама"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Отклони грешке у вези са радњама за исецање области које нису правоугаоног облика"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Прикажи профил помоћу GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Мери време приказивања у adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Размера анимације прозора"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Размера анимације прелаза"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Animator размера трајања"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Ограничење позад. процеса"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Прикажи све ANR-ове"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Прикажи дијалог Апликација не реагује за апликације у позадини"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Користи ескперим. WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Апликације ће користити најновији (beta) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Коришћење података"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Циклус потрошње података"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Пренос података у ромингу"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ограничи позадинске податаке"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Одвоји потрошњу 4G података"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Прикажи потрошњу Wi-Fi података"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Прикажи потрошњу за Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Прикажи употребу Етернета"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Мобилни хотспотови"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Аутоматски синхронизуј податке"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Подеси ограничење за мобил. под."</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Подеси ограничење за 4G податке"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Подеси ограничење за 2G-3G податке"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Подеси ограничење Wi-Fi података"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Ограничи Wi-Fi податке"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Етернет"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобилни"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1706,8 +1736,8 @@
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"Ова функција може да заустави апликацију која зависи од позадинских података када су доступне само мобилне мреже."\n\n"Адекватније контроле за коришћење података можете да пронађете у подешавањима доступним у оквиру апликације."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Ограничавање позадинских података је могуће само када будете подесили ограничење за мобилне податке."</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључити аутом. синх. података?"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Све промене које обавите на налозима на Вебу биће аутоматски копиране на таблет."\n\n"Неки налози могу и да аутоматски копирају на Веб све промене које обавите на таблету. Google налог функционише на овај начин."\n\n"Да бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Све промене које обавите на налозима на Вебу биће аутоматски копиране на телефон."\n\n"Неки налози могу и да аутоматски копирају на Веб све промене које обавите на телефону. Google налог функционише на овај начин."\n\n"Да бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="7312283529426636845">"Све промене које обавите на налозима на вебу биће аутоматски копиране на таблет."\n\n"Неки налози могу и да аутоматски копирају на Веб све промене које обавите на таблету. Google налог функционише на овај начин."\n\n"Да бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="2374996799819303283">"Све промене које обавите на налозима на вебу биће аутоматски копиране на телефон."\n\n"Неки налози могу и да аутоматски копирају на Веб све промене које обавите на телефону. Google налог функционише на овај начин."\n\n"Да бисте изабрали које ће се врсте информација синхронизовати између сваког налога, идите на Подешавања &gt; Налози."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Искључити аутом. синх. података?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4744145757533455623">"На овај начин ће се смањити потрошња података и батерије, али биће потребно да ручно синхронизујете сваки налог да бисте прикупили недавне информације. Нећете примати ни обавештења када дође до ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум враћања циклуса потрошње на почетне вредности"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто таблет мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобилна веза за пренос података биће онемогућена када се достигне назначено ограничење."\n\n"Пошто телефон мери потрошњу података, а оператер може да обрачунава потрошњу на други начин, размотрите коришћење нижег ограничења."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Желите ли да ограничите позадинске податке?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати осим ако нисте повезани са Wi-Fi мрежом."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати осим ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог таблета."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог телефона."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог таблета."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ако ограничите позадинске податке за мобилне уређаје, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi мрежом."\n\n"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"упозорење"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"Ограничење"\n"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font><font size="12"></font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Уклоњене апликације"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: Таблет је измерио да је искоришћено око <xliff:g id="TOTAL">%1$s</xliff:g>. Оператер можда другачије мери."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: Телефон је измерио да је искоришћено око <xliff:g id="TOTAL">%1$s</xliff:g>. Оператер можда другачије мери."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Мобилни хотспотови"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Изаберите Wi-Fi мреже које су хотспотови за мобилне уређаје. Апликације неће моћи да користе ове мреже када су у позадини. Апликације ће вас можда и упозорити пре коришћења ових мрежа за велика преузимања."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Изаберите Wi-Fi мреже које су мобилни хотспотови. Апликације неће моћи да користе ове мреже када су у позадини. Апликације ће вас можда и упозорити пре коришћења ових мрежа за велика преузимања."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобилне мреже"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi мреже"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Да бисте изабрали мобилне хотспотове, укључите Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi мреже"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Да бисте изабрали мобилне хотспотове, укључите Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Хитни позив"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Назад на позив"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назив"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Омогућено"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Спровођење"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Корисници"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Ви"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Остали корисници"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Додај корисника"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Активан"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Није активан"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Корисници и профили"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Додај корисника или профил"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Ограничени профил"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Да бисте могли да направите ограничени профил, потребно је да подесите закључавање екрана да бисте заштитили апликације и личне податке."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Подеси закључавање"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Није подешено"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Није подешен – Ограничени профил"</string>
     <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
+    <string name="user_you" msgid="1639158809315025986">"Ви (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Надимак"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Додавање"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Корисници имају сопствене апликације и садржај"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Можете да ограничите приступ на апликације и садржај са налога"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Корисник"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Ограничени профил"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додавање новог корисника"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Можете да делите овај уређај са другим људима тако што ћете направити додатне кориснике. Сваки корисник има сопствени простор, који може да прилагођава помоћу својих апликација, позадина итд. Корисници могу да прилагођавају и подешавања таблета као што је Wi-Fi, а која утичу на свакога."\n\n"Када направите новог корисника, та особа треба да обави подешавање."\n\n"Сваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Овај уређај можете да делите са другим људима тако што ћете направити додатне кориснике. Сваки корисник има сопствени простор, који може да прилагођава помоћу својих апликација, позадина итд. Корисници могу да прилагођавају и подешавања таблета као што је Wi-Fi, која утичу на свакога."\n\n"Када направите новог корисника, та особа треба да обави подешавање."\n\n"Сваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Када направите новог корисника, та особа треба да обави подешавање."\n\n"Сваки корисник може да прихвата ажуриране дозволе апликација у име свих осталих корисника."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Подешавате корисника одмах?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Уверите се да особа може да узме таблет и подеси свој простор"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Желите ли да одмах подесите профил?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Подеси одмах"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не сада"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Само власник таблета може да управља корисницима."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Само власник телефона може да управља корисницима."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ограничени профили не могу да додају налоге"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Избриши <xliff:g id="USER_NAME">%1$s</xliff:g> са уређаја"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Нови корисник"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Нови профил"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Желите ли да избришете себе?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Уклоните корисника?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Желите да уклон. профил?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Изгубићете простор и податке на овом таблету. Не можете да опозовете ову радњу."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Изгубићете простор и податке на овом телефону. Не можете да опозовете ову радњу."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Простор и подаци овог корисника ће нестати са овог таблета. Не можете да опозовете ову радњу."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Простор и подаци овог корисника ће нестати са овог телефона. Не можете да опозовете ову радњу."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Простор и подаци овог профила ће нестати са овог таблета. Не можете да опозовете ову радњу."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Простор и подаци овог профила ће нестати са овог телефона. Не можете да опозовете ову радњу."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Додавање новог корисника..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Брисање корисника"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Избриши"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Прошири подешавања апликације"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Ово подешавање утиче на све кориснике овомг таблета."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Ово подешавање утиче на све кориснике овог телефона."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Промена језика"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Поруке инфо сервиса"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изаберите типове упозорења на хитне случајеве који ће се приказивати."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Ограничења апликација и садржаја"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПРЕИМЕНУЈ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Подеси ограничења апликација"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi и мобилни уређаји"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволите измену Wi‑Fi подешавања и подешавања за мобилне уређаје"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дозволите измене Bluetooth упаривања и подешавања"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дозволите размену података када таблет додирне други уређај"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дозволите размену података када телефон додирне други уређај"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Приступ локацији"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Дозволите да апликације користе информације о локацији"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Даље"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Заврши"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Сними слику"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Изабери слику из Галерије"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 44ce64c..941aee8 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Långsam"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Snabb"</item>
-    <item msgid="2538100882620724753">"Mycket snabb"</item>
+    <item msgid="1370673569131070146">"Snabbare"</item>
+    <item msgid="4648206845228970803">"Mycket snabbt"</item>
+    <item msgid="4977949754169483251">"Supersnabbt"</item>
+    <item msgid="6106302964845503577">"Turbosnabbt"</item>
+    <item msgid="6800277205640837264">"Snabbast"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Mycket låg"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Inga"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Inga"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Ej angiven"</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">"Lagring på intern enhet"</item>
     <item msgid="3738430123799803530">"Flyttbart SD-kort"</item>
     <item msgid="4498124044785815005">"Låt systemet bestämma"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Plats"</item>
+    <item msgid="255608127647030286">"Personligt"</item>
+    <item msgid="4588829735729884491">"Meddelanden"</item>
+    <item msgid="8971765125227378270">"Enhet"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ungefärlig plats"</item>
+    <item msgid="5789673140227507995">"exakt plats"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"vibration"</item>
+    <item msgid="3434165993711230924">"läsa kontakter"</item>
+    <item msgid="616161687718081936">"ändra kontakter"</item>
+    <item msgid="7638002295329050091">"läsa samtalslogg"</item>
+    <item msgid="6546959730920410907">"ändra samtalslogg"</item>
+    <item msgid="446877710771379667">"läsa kalender"</item>
+    <item msgid="7674458294386319722">"ändra kalender"</item>
+    <item msgid="8281201165558093009">"Wi-Fi-skanning"</item>
+    <item msgid="8694611243479480497">"meddelande"</item>
+    <item msgid="7776439107987345446">"mobilskanning"</item>
+    <item msgid="514615766544675057">"ringa samtal"</item>
+    <item msgid="8181415497109310680">"läsa SMS"</item>
+    <item msgid="6816551144382117307">"skriva SMS"</item>
+    <item msgid="4600463921908905030">"ta emot SMS"</item>
+    <item msgid="5958926493289432745">"ta emot nöd-SMS"</item>
+    <item msgid="4945269495221089540">"ta emot MMS"</item>
+    <item msgid="5570472453573929087">"ta emot WAP-push"</item>
+    <item msgid="7125408150230860501">"skicka SMS"</item>
+    <item msgid="7080337936612188061">"läsa ICC-SMS"</item>
+    <item msgid="587124103118495063">"skriva ICC-SMS"</item>
+    <item msgid="2320577158869025503">"ändra inställningar"</item>
+    <item msgid="1545733463471924009">"Rita högst upp"</item>
+    <item msgid="3609046903962454582">"få åtkomst till meddelanden"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"spela in ljud"</item>
+    <item msgid="5031552983987798163">"spela upp ljud"</item>
+    <item msgid="8374996688066472414">"läs Urklipp"</item>
+    <item msgid="3045529469061083747">"ändra Urklipp"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Plats"</item>
+    <item msgid="8677040780775113033">"Plats"</item>
+    <item msgid="1660743989948992916">"Plats"</item>
+    <item msgid="8791172739860195290">"Vibration"</item>
+    <item msgid="383413555642128046">"Läsa kontakter"</item>
+    <item msgid="3654594895269697313">"Ändra kontakter"</item>
+    <item msgid="7928393476362362538">"Läsa samtalslogg"</item>
+    <item msgid="6248591205254641116">"Ändra samtalslogg"</item>
+    <item msgid="6093344633066170692">"Läsa kalender"</item>
+    <item msgid="1334886368750347692">"Ändra kalender"</item>
+    <item msgid="1638204101698708656">"Plats"</item>
+    <item msgid="2154671955760380322">"Lägga upp meddelande"</item>
+    <item msgid="4282477730595931828">"Plats"</item>
+    <item msgid="4891423912898525905">"Ringa samtal"</item>
+    <item msgid="626463821668200388">"Ta emot SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Skicka SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Ta emot SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Ta emot SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Ta emot SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Ta emot SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Skicka SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Ta emot SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Skicka SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Ändra inställningar"</item>
+    <item msgid="736541391767350377">"Rita högst upp"</item>
+    <item msgid="5530815681721654194">"Få åtkomst till meddelanden"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Spela in ljud"</item>
+    <item msgid="3493046322001257041">"Spela upp ljud"</item>
+    <item msgid="136815868796597058">"Läs Urklipp"</item>
+    <item msgid="5238692940326972503">"Ändra Urklipp"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kort"</item>
     <item msgid="2560532955514699713">"Mellan"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (grafik)"</item>
     <item msgid="1340692776955662664">"Anropsstacken på glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Av"</item>
+    <item msgid="675719912558941285">"Rita icke-rektangulära urklippsavsnitt i blått"</item>
+    <item msgid="1064373276095698656">"Markera testade ritningskommandon i grönt"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Av"</item>
+    <item msgid="2751513398307949636">"På skärmen som fält"</item>
+    <item msgid="8272260411216018353">"På skärmen som rader"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standardgräns"</item>
     <item msgid="4071574792028999443">"Inga bakgrundsprocesser"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a64386a..8c2681f 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -268,16 +268,16 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Flygplansläge"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Mer..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådlöst och nätverk"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobila nätverk och VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobilnät och VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Anslut till datatjänster vid roaming"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Anslut till datatjänster vid roaming"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera roaming."</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Du förlorade dataanslutningen eftersom du lämnade ditt hemnätverk utan att aktivera dataroaming."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Aktivera"</string>
-    <string name="roaming_warning" msgid="7625933694709170887">"När du tillåter roaming kan det tillkomma vissa avgifter!"</string>
+    <string name="roaming_warning" msgid="7625933694709170887">"När du tillåter dataroaming kan det tillkomma vissa avgifter!"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Om du tillåter dataroaming kan det leda till höga kostnader."\n\n"Den här inställningen påverkar samtliga användare."</string>
     <string name="roaming_warning_multiuser" product="default" msgid="6368421100292355440">"Om du tillåter dataroaming kan det leda till höga kostnader."\n\n"Den här inställningen påverkar samtliga användare."</string>
-    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vill du tillåta roaming?"</string>
+    <string name="roaming_reenable_title" msgid="6068100976707316772">"Vill du tillåta dataroaming?"</string>
     <string name="networks" msgid="6333316876545927039">"Val av operatör"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Välj en nätverksoperatör"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum och tid"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ange text som ska visas på den låsta skärmen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Visa användarinfo på den låsta skärmen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Användarinfo"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Visa profilinfo på den låsta skärmen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinfo"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Platsåtkomst"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Säkerhet"</string>
     <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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministration"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Enhetsadministratörer"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visa eller inaktivera enhetsadministratörer"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Åtkomst till meddelanden"</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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Aktivera Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -492,9 +503,9 @@
     <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_display_settings_title" msgid="564299108014609382">"Visningsalternativ för trådlös skärm"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Trådlös skärm"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Om du vill visa enheter aktiverar du funktionen så att trådlösa skärmar visas."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Trådlösa skärmar visas inte eftersom Wi-Fi är inaktiverat."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Trådlösa enheter visas inte eftersom Wi-Fi är inaktiverat."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Sök efter enheter"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Söker …"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Det gick inte att hitta några enheter."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"När den här funktionen är aktiverad kan du överföra appinnehåll till en annan NFC-kompatibel enhet genom att hålla enheterna mot varandra. Du kan t.ex. överföra webbläsarsidor, YouTube-videoklipp, kontakter med mera."\n\n"Håll bara enheterna mot varandra (oftast baksida mot baksida) och tryck sedan på skärmen. Appen avgör vad som överförs."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Hitta nätverkstjänst"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Tillåt att appar på andra enheter hittar appar på den här enheten"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Aktivera Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi-inställningar"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktivera Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi-inställningar"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Välj Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi aktiveras"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Inaktiverar Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Välj Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Wi-Fi aktiveras …"</string>
+    <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="3038290727701553612">"Meddela mig när ett öppet 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="2466956369738047669">"Använd inte Wi-Fi-nätverk som inte har en bra Internetanslutning"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Behåll Wi-Fi i viloläge"</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_scan_always_available" msgid="3470564139944368030">"Inställningen \"sök alltid\" är tillgänglig"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Installera certifikat"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"För att bland annat noggrannheten i platsangivelsen ska förbättras kan Google och vissa appar söka efter nätverk i närheten även när Wi-Fi är avstängt. Om du inte vill att detta ska ske väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Appar kan söka efter nätverk i närheten även om Wi-Fi är avstängt. Om du inte vill att det ska hända väljer du Avancerat &gt; Inställningen \"sök alltid\" är tillgänglig."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Visa inte igen"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Behåll Wi-Fi i viloläge"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ett problem inträffade när inställningen ändrades"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi-optimering"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimera batterianvändningen när Wi-Fi är aktiverat"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Minimera batterianvändningen när Wi-Fi är aktiverat"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Lägg till nätverk"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi-nätverk"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi-nätverk"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS-tryckknapp"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Fler alternativ"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS-PIN"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi direkt"</string>
+    <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_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glöm nätverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Aktivera Wi-Fi för att visa tillgängliga nätverk."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Söker efter Wi-Fi-nätverk …"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aktivera Wi-Fi för att visa tillgängliga nätverk."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Söker efter Wi-Fi-nätverk …"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har inte behörighet att ändra Wi‑Fi-nätverket."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Annat nätverk …"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Mer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Automatisk installation (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Surfplattan måste vara ansluten till Wi-Fi för att du ska kunna slutföra konfigurationen. När du är färdig med konfigurationen kan du välja mellan mobildataanslutning och Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Surfplattan måste vara ansluten till Wi-Fi för att du ska kunna slutföra konfigurationen. När du är färdig med konfigurationen kan du välja mellan mobildata och Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Visa avancerade alternativ"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Skyddad Wi-Fi-konfiguration"</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="7204827509934892103">"Tryck på knappen Wi-Fi Protected Setup på routern. Den kan kallas WPS eller vara märkt med denna symbol:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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 installationen."</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_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="5754399645462924103">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS pågår redan och kan ta upp till två minuter att slutföra"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS misslyckades. Försök igen om några minuter."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Säkerhetsinställningen för den trådlösa routern (WEP) stöds inte"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Autentiseringsfel. Försök igen."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"En annan WPS-session upptäcktes. Försök igen om några minuter."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Nätverks-SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Ange SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Säkerhet"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Signalstyrka"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Status"</string>
@@ -595,12 +614,15 @@
     <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
     <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"Undvek dålig Internetanslutning"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
-    <string name="wifi_not_in_range" msgid="1136191511238508967">"Inte i intervall"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Utom räckhåll"</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_secured_first_item" msgid="4072076186051083451">"Skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Vill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Avvisa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Anslut"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Glöm"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Hoppa inte över"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen kan kräva betydande nätverksaktivitet."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"VARNING! Eventuella operatörsavgifter för datatrafik kan tillkomma."\n\n"Konfigurationen kan kräva betydande nätverksaktivitet."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"VARNING! Surfplattan kommer inte att kunna kontrollera om programvaran är uppdaterad."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"VARNING! Mobilen kommer inte att kunna kontrollera om programvaran är uppdaterad."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Surfplattan kunde inte anslutas till Wi-Fi-nätverket."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Mobilen kunde inte anslutas till Wi-Fi-nätverket."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Avancerat för Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi-frekvensband"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"Varning! Om du inte är ansluten till internet kan surfplattan inte verifiera att programvaran är uppdaterad."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"Varning! Om du inte är ansluten till internet kan mobilen inte verifiera att programvaran är uppdaterad."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Det gick inte att ansluta surfplattan till Wi-Fi-nätverket."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Det gick inte att ansluta mobilen till Wi-Fi-nätverket."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Avancerat för Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi-frekvensband"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Ange driftområde för frekvens"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Ett problem uppstod när frekvensband ställdes in."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Mac-adress"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Nätverksprefixets längd"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi direkt"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Enhetsinformation"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Kom ihåg anslutningen"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Sök efter enheter"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Avvisa inbjudan?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vill du avvisa inbjudan att ansluta till <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Vill du glömma den här gruppen?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobil Wi-Fi-surfzon"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverar trådlös surfzon ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Trådlös surfzon inaktiveras ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobil surfpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fel på mobil Wi-Fi-surfpunkt"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfigurera trådlös surfzon via Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> mobil Wi-Fi-surfpunkt"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Fel på mobil Wi-Fi-surfzon"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Konfigurera trådlös surfzon via Wi-Fi"</string>
+    <string name="wifi_tether_configure_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="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
@@ -666,9 +688,9 @@
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardljud för meddelanden"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulserande ljusavisering"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkande ljusavisering"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"Meddelande"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"Avisering"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Använd volymen för inkommande samtal vid avisering"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Standardljud för meddelanden"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Media"</string>
@@ -708,7 +730,7 @@
     <string name="account_settings" msgid="6403589284618783461">"Konton"</string>
     <string name="search_settings" msgid="1910951467596035063">"Sök"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Visning"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Skärm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Rotera skärmen automatiskt"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Växla riktning automatiskt när du roterar surfplattan"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Växla riktning automatiskt när du roterar telefonen"</string>
@@ -723,11 +745,11 @@
     <string name="screensaver_settings_title" msgid="3349790120327233241">"Dagdrömmar"</string>
     <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"När enheten dockas eller laddas i viloläge"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Båda"</string>
-    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Under laddning"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Medan enheten dockas"</string>
+    <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Telefonen laddar"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Enheten dockas"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Om du vill styra vad som händer när mobilen är dockad eller i viloläge aktiverar du dagdrömsläget."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Då ska dagdrömmar aktiveras"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Aktivera dagdrömmar när"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Starta nu"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Inställningar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Signalstyrka"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Nätverk"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi Mac-adress"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC-adress"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth-adress"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serienummer"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Inte tillgängligt"</string>
@@ -803,7 +825,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"Tillgängligt (skrivskyddat)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Totalt utrymme"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Beräknas..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Appar (data i appar och medieinnehåll)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Appar (appdata och medieinnehåll)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"Hämtningar"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Bilder, videor"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN aktiverat"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN inaktiverat"</string>
     <string name="bearer" msgid="594270280031923558">"Bearer"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO-typ"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO-värde"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Ta bort APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Nytt APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Spara"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjälp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobila nätverk"</string>
     <string name="location_title" msgid="1029961368397484576">"Min plats"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Plats från Wi-Fi/mobilnätverk"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Plats från Wi-Fi/mobilnätverk"</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="7457348712272184793">"Platsen fastställs av Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Platsen fastställs via Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS-satelliter"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Ge appar möjlighet att använda surfplattans GPS för att fastställa mer exakt var du befinner dig"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Ge appar möjlighet att använda mobilens GPS för att fastställa mer exakt var du befinner dig"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtrera"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Välj filteralternativ"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Alla"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Inaktiverade"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Hämtade"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Om du inaktiverar en inbyggd app kan det hända att andra appar inte fungerar korrekt. Dina uppgifter kommer också att tas bort."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Inaktivera meddelanden?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Om du inaktiverar meddelanden för den här appen kanske du missar viktiga meddelanden och uppdateringar."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Appåtgärder"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Kör"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Har aldrig använts)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Använt utrymme"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Visa lagring som används av appar"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Ord:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Genväg:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Språk:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Skriv ett ord"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Valfri genväg"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Redigera ord"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Redigera"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Radera"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Inställningar för fysiskt tangentbord"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Utvecklaralternativ"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Ange alternativ för apputveckling"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Utvecklaralternativ är inte tillgängliga för den här användaren"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB-felsökning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Felsökningsläge när USB har anslutits"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Återkalla åtkomst till USB-felsökning"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Felrapporter på startmenyn"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkludera alternativet att skapa en felrapport på startmenyn"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Håll aktiverad"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Tillåt utvecklarinställningar?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Inställningarna är endast avsedda att användas för utvecklingsändamål. De kan orsaka problem med enheten eller apparna som finns installerade på den."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Verifiera appar via USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Använd knapp för att avsluta samtal"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Läs upp lösenord"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Fördröjning för tryck och håll ned"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Ökad webbtillgänglighet"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Inställningar"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"På"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Av"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Tillåtet"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Inte tillåtet"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Tillåt"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Tillåt inte"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Vill du använda <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan samla in all text som du skriver, förutom lösenord. Det gäller t.ex. personliga uppgifter som kreditkortsnummer. Även data om din kommunikation med enheten kan samlas in."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> kan samla in all text som du skriver, förutom lösenord. Det gäller t.ex. personliga uppgifter som kreditkortsnummer. Även data om din kommunikation med enheten kan samlas in."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Vill du avbryta <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Om du trycker på OK avbryts <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observera dina aktiviteter"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Ta emot meddelanden när du kommunicerar med en app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Vill du avbryta <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Om du trycker på OK avbryts <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Inga tjänster är installerade"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Behöver du en skärmläsare?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack ger talad feedback till användare som är blinda eller har nedsatt syn. Vill du installera den gratis från Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Vill du att appar ska installera skript från Google som gör innehållet mer tillgängligt?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Ingen beskrivning har angetts."</string>
     <string name="settings_button" msgid="3006713718908152930">"Inställningar"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Batteri"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Laddar"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skärm på"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS på"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"WiFi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Aktiv"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal i mobilt nätverk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"WiFi i tid"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"WiFi i tid"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi i tid"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi i tid"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detaljerad historik"</string>
     <string name="details_title" msgid="3792801565213935385">"Information om förbrukning"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Justera strömförbrukningen"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Inkluderade paket"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skärm"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Mobilens viloläge"</string>
     <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
@@ -1369,20 +1397,20 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU i förgrunden"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Behåll aktiv"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"WiFi körs"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi körs"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Surfplatta"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Skickade data"</string>
     <string name="usage_type_data_recv" msgid="7251090882025234185">"Mottagna data"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Ljud"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
-    <string name="usage_type_on_time" msgid="3351200096173733159">"Tid som funktionen varit på"</string>
+    <string name="usage_type_on_time" msgid="3351200096173733159">"Tid aktiverad"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Tid utan täckning"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Tvingad avslutning"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Info om appen"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Appinställningar"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Skärminställningar"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"WiFi-inställningar"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi-inställningar"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth-inställningar"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Batteri som förbrukats av röstsamtal"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Batteri som förbrukas när surfplattan är inaktiv"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Växla till flygplansläge om du vill spara batteri när du är i ett område utan täckning"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Batteri som förbrukats av skärm och bakgrundsbelysning"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Minska skärmens ljusstyrka och/eller skärmens tidsgräns"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Batteri som förbrukats av Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Inaktivera Wi-Fi när det inte används eller när det inte är tillgängligt"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Batteri som förbrukats av Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Inaktivera Wi-Fi när det inte används eller när det inte är tillgängligt"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Batteri som förbrukats av Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Inaktivera Bluetooth när du inte använder funktionen"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Försök ansluta till en annan Bluetooth-enhet"</string>
@@ -1416,7 +1444,7 @@
     <string name="recognizer_settings_title" msgid="432493301215113154">"Röstsökning"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Inställningar för \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-till-tal-inställningar"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Text-till-tal-utdata"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Text-till-tal"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Använd alltid mina inställningar"</string>
     <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>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Konfigurera"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Välj en annan motor"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Talsyntesmotorn kan samla in all text som ska talas, inklusive personlig information som lösenord och kreditkortsnummer. Den kommer från <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-motorn. Vill du använda den här talsyntesmotorn?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Det krävs en fungerande nätverksanslutning för att text-till-tal ska fungera för det här språket."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorer"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>-inställningar"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> är aktiverad"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Prioriterad sökmotor"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Allmänt"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Strömkontroll"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Uppdaterar Wi-Fi-inställningar"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Wi-Fi-inställningar uppdateras"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Uppdatera Bluetooth-inställningar"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"på"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"av"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"aktiverar"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"inaktiverar"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Synkronisera"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort alla certifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Tillförlitlig autentisering"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visa tillförlitliga CA-certifikat"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Lagringstyp"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarustöd"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Endast programvara"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rita ditt grafiska lösenord"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Säkerhetskopiera och återställ"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personliga data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Säkerhetskopiera mina data"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Spara en säkerhetskopia av appdata, Wi-Fi-lösenord och andra inställningar på Googles servrar"</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="auto_restore_title" msgid="5397528966329126506">"Automatisk återställning"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Det nya lösenordet och bekräftelsen stämmer inte överens"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Det gick inte att ange ett reservlösenord"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Vill du sluta säkerhetskopiera Wi-Fi-lösenord, bokmärken, andra inställningar och appdata samt ta bort alla kopior på Googles servrar?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Vill du sluta säkerhetskopiera Wi-Fi-lösenord, bokmärken, andra inställningar och appdata samt ta bort alla kopior på Googles servrar?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Inställningar för enhetsadministration"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Enhetsadministratör"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Inaktivera"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Aviseringar"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringsignal och vibration"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"WiFi-konfiguration"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Anslut till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Ansluter till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g> ..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ansluten till Wi-Fi-nätverk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi-konfiguration"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Anslut till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Ansluter till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g> …"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Lägg till ett nätverk"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Inte ansluten"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Lägg till nätverk"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Ansluter ..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Fortsätt till nästa steg"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP stöds inte."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Det går inte att konfigurera en EAP-Wi-Fi-anslutning under installationen. Efter installationen kan du göra det i Inställningar &gt; Trådlöst och nätverk."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Det går inte att konfigurera en EAP-Wi-Fi-anslutning under installationen. Efter installationen kan du göra det i Inställningar &gt; Trådlöst och nätverk."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Det kan ta några minuter att ansluta ..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Tryck på "<b>"Nästa"</b>" om·du vill fortsätta med installationen."\n\n"Tryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryck på "<b>"Nästa"</b>" om du vill fortsätta med installationen."\n\n"Tryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiverad"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering inaktiverad"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfel."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Felsökaren måste ansluta till appen först"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Indata"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Ritning"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Maskinvaruaccelererad rendering"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Övervakning"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Strikt läge aktiverat"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Tänd skärm när app gör omfattande åtgärd på huvudtråd"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Från bäst till sämst: blå, grön, ljusröd, röd"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Inaktivera HW-överlagringar"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Aktivera spår"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Välj aktiverade spår"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Inga spår är aktiverade för närvarande"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> spår är aktiverade för närvarande"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Alla spår är aktiverade för närvarande"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Aktivera OpenGL-spår"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Visa layoutgränser"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Visa gränser för videoklipp, marginaler m.m."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Tvingad användning av GPU för 2D-ritning"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Force 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Aktivera 4x MSAA i OpenGL ES 2.0-appar"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Felsök icke-rektangulära urklippsåtgärder"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profilens GPU-rendering"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Mät tid för rendering i adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Skala, fönsteranimering"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Begränsa bakgrundsprocess"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Visa alla som inte svarar"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Visa dialogrutan om att appen inte svarar för bakgrundsappar"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Experimentell WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Appar kommer att använda nya WebView (beta)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Dataanvändning"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Dataanvändningscykel"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dataroaming"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Begränsa bakgrundsdata"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Separat 4G-användning"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Visa Wi-Fi-användning"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Visa Wi-Fi-användning"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Visa Ethernet-användning"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobila trådlösa surfzoner"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatisk datasynkronisering"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Ange gräns för mobildata"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Ange gräns för data via 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Ange gräns för data via 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Ange gräns för data via Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Gräns för data via Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobilt"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av surfplattan, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Mobildataanslutningen inaktiveras när den angivna gränsen är nådd."\n\n" Eftersom dataanvändningen mäts med hjälp av mobilen, och det kan hända att din operatör beräknar användningen annorlunda, kan det vara bra att använda en lågt beräknad gräns."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vill du begränsa bakgrundsdata?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Om du begränsar mobildata i bakgrunden kanske vissa appar och tjänster inte fungerar såvida du inte är ansluten till ett Wi-Fi-nätverk."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Om du begränsar mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Om du begränsar användningen av mobildata i bakgrunden kommer vissa appar och tjänster bara att fungera när du är ansluten till ett Wi-Fi-nätverk."\n\n"Den här inställningen påverkar samtliga användare."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"varning"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"gräns"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Borttagna appar"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts enligt pekdatorns mätning.  Resultatet kan skilja sig från operatörens beräkning av dataanvändningen."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ca <xliff:g id="TOTAL">%1$s</xliff:g> har använts enligt mobilens mätning. Resultatet kan skilja sig från operatörens beräkning av dataanvändningen."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobila trådlösa surfzoner"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Välj Wi-Fi-nätverk som är mobila hotspots. Appar kan hindras från att använda dessa nätverk när de körs i bakgrunden. Det kan även visas en varning i apparna innan du använder dessa nätverk för stora hämtningar."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Välj de Wi-Fi-nätverk som är trådlösa surfzoner för mobila enheter. Appar kan hindras från att använda dessa nätverk när de körs i bakgrunden. Det kan även visas en varning i apparna innan du använder dessa nätverk för stora hämtningar."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobila nätverk"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi-nätverk"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Aktivera Wi-Fi om du vill välja trådlösa surfzoner för mobilen."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi-nätverk"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Aktivera Wi-Fi om du vill välja surfzoner för mobila enheter."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Nödsamtal"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Tillbaka till samtal"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Namn"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Tillåtande"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Genomdrivande"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Användare"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Du"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Andra användare"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Lägg till användare"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktiv"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Ej aktiv"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Användare och profiler"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Lägg till användare eller profil"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Begränsad profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Innan du skapar en begränsad profil måste du konfigurera ett skärmlås för att skydda dina appar och personliga data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Konfigurera lås"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Inte konfigurerad"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Profilen har inte konfigurerats – begränsad profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Ägare"</string>
+    <string name="user_you" msgid="1639158809315025986">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Smeknamn"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Lägg till"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Användare har egna appar och eget innehåll"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Du kan begränsa åtkomsten till appar och innehåll i ditt konto"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Användare"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Begränsad profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Lägg till en ny användare"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Du kan dela den här enheten med andra genom att skapa fler användare. Alla användare har sitt eget utrymme som de kan anpassa med appar, bakgrunder med mera. Användarna kan även justera inställningar för surfplattan som påverkar alla andra, till exempel Wi-Fi."\n\n"När du skapar en ny användare måste han eller hon genomgå en konfigureringsprocess."\n\n"Alla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Du kan dela den här enheten med andra genom att skapa fler användare. Alla användare har sitt eget utrymme som de kan anpassa med appar, bakgrunder med mera. Användarna kan även justera inställningar för surfplattan som påverkar alla andra, till exempel för Wi-Fi."\n\n"När du skapar en ny användare måste han eller hon genomgå en konfigureringsprocess."\n\n"Alla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"När du skapar en ny användare måste han eller hon genomgå en konfigureriringsprocess."\n\n"Alla användare kan godkänna uppdaterade appbehörigheter för alla andra användare."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Konfigurera användare nu?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Se till att personen har möjlighet att använda surfplattan och konfigurera sitt utrymme"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Vill du konfigurera en profil nu?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Konfigurera nu"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Inte nu"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Det är bara surfplattans ägare som kan hantera användare."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Det är bara mobilens ägare som kan hantera användare."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Begränsade profiler kan inte lägga till konton"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ta bort <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Ny användare"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vill du ta bort dig själv?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Ta bort användaren?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Vill du ta bort profilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Ditt utrymme och dina data tas bort från surfplattan. Det går inte att ångra den här åtgärden."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Ditt utrymme och dina data tas bort från mobilen. Det går inte att ångra den här åtgärden."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Användarens utrymme och data tas bort från surfplattan. Det går inte att ångra den här åtgärden."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Användarens utrymme och data tas bort från mobilen. Det går inte att ångra den här åtgärden."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Profilens utrymme och data tas bort från surfplattan. Det går inte att ångra den här åtgärden."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Profilens utrymme och data tas bort från mobilen. Det går inte att ångra den här åtgärden."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"En ny användare läggs till …"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Ta bort användare"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Ta bort"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Den här inställningen påverkar samtliga användare."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Ändra språk"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Välj vilka typer av varningsmeddelanden som ska visas."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Begränsa appar och innehåll"</string>
+    <string name="user_rename" msgid="8523499513614655279">"BYT NAMN"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Ange gränser för appen"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Tillåt ändring av Bluetooth-kopplingar och -inställningar"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Tillåt datautbyte när surfplattan vidrör en annan enhet"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Tillåt datautbyte när mobilen vidrör en annan enhet"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Platsåtkomst"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Tillåt att appar använder din platsinformation"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Föregående"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Nästa"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Slutför"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Ta foto"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Välj ett foto från galleriet"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 3af195a..d7c0c7b 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Polepole"</item>
     <item msgid="1145554631248513562">"Kawaida"</item>
     <item msgid="7553665153391107454">"Haraka"</item>
-    <item msgid="2538100882620724753">"Haraka sana"</item>
+    <item msgid="1370673569131070146">"Kwa kasi"</item>
+    <item msgid="4648206845228970803">"Kasi sana"</item>
+    <item msgid="4977949754169483251">"Haraka"</item>
+    <item msgid="6106302964845503577">"Haraka sana"</item>
+    <item msgid="6800277205640837264">"Haraka mno"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Chini sana"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -155,7 +162,7 @@
     <item msgid="1390404486722375028">"kamwe"</item>
   </string-array>
   <string-array name="wifi_frequency_band_entries">
-    <item msgid="624340809384223320">"Atomatiki"</item>
+    <item msgid="624340809384223320">"Kiotomatiki"</item>
     <item msgid="6670588712989942178">"GHz 5 tu"</item>
     <item msgid="2715516524973207876">"GHz 2.4 tu"</item>
   </string-array>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Bila"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Hamna"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"(haijabainishwa)"</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">"Kifaa cha hifadhi ya ndani"</item>
     <item msgid="3738430123799803530">"Kadi ya SD inayoondolewa"</item>
     <item msgid="4498124044785815005">"Wacha mfumo uamue"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Eneo"</item>
+    <item msgid="255608127647030286">"Binafsi"</item>
+    <item msgid="4588829735729884491">"Utumaji ujumbe"</item>
+    <item msgid="8971765125227378270">"Kifaa"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"eneo lisilo laini"</item>
+    <item msgid="5789673140227507995">"Eneo bora"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"tetema"</item>
+    <item msgid="3434165993711230924">"soma anwani"</item>
+    <item msgid="616161687718081936">"rekebisha anwani"</item>
+    <item msgid="7638002295329050091">"soma rajisi ya simu"</item>
+    <item msgid="6546959730920410907">"rekebisha rajisi ya simu"</item>
+    <item msgid="446877710771379667">"soma kalenda"</item>
+    <item msgid="7674458294386319722">"rekebisha kalenda"</item>
+    <item msgid="8281201165558093009">"uchanganuzi wa wi-fi"</item>
+    <item msgid="8694611243479480497">"arifa"</item>
+    <item msgid="7776439107987345446">"uchanganuzi wa seli"</item>
+    <item msgid="514615766544675057">"piga simu"</item>
+    <item msgid="8181415497109310680">"soma SMS"</item>
+    <item msgid="6816551144382117307">"andika SMS"</item>
+    <item msgid="4600463921908905030">"pokea SMS"</item>
+    <item msgid="5958926493289432745">"pokea SMS za dharura"</item>
+    <item msgid="4945269495221089540">"pokea MMS"</item>
+    <item msgid="5570472453573929087">"pokea msukumo wa WAP"</item>
+    <item msgid="7125408150230860501">"tuma SMS"</item>
+    <item msgid="7080337936612188061">"soma SMS za ICC"</item>
+    <item msgid="587124103118495063">"andika SMS za ICC"</item>
+    <item msgid="2320577158869025503">"rekebisha mipangilio"</item>
+    <item msgid="1545733463471924009">"chora juu"</item>
+    <item msgid="3609046903962454582">"fikia arifa"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"rekodi sauti"</item>
+    <item msgid="5031552983987798163">"cheza sauti"</item>
+    <item msgid="8374996688066472414">"soma ubao klipu"</item>
+    <item msgid="3045529469061083747">"badilisha ubao klipu"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Eneo"</item>
+    <item msgid="8677040780775113033">"Eneo"</item>
+    <item msgid="1660743989948992916">"Eneo"</item>
+    <item msgid="8791172739860195290">"Tetema"</item>
+    <item msgid="383413555642128046">"Soma anwani"</item>
+    <item msgid="3654594895269697313">"Rekebisha anwani"</item>
+    <item msgid="7928393476362362538">"soma rajisi ya simu"</item>
+    <item msgid="6248591205254641116">"Rekebisha rajisi ya simu"</item>
+    <item msgid="6093344633066170692">"Soma kalenda"</item>
+    <item msgid="1334886368750347692">"Rekebisha kalenda"</item>
+    <item msgid="1638204101698708656">"Eneo"</item>
+    <item msgid="2154671955760380322">"Chapisha arifa"</item>
+    <item msgid="4282477730595931828">"Eneo"</item>
+    <item msgid="4891423912898525905">"Piga simu"</item>
+    <item msgid="626463821668200388">"Pokea SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Tuma SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Pokea SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Pokea SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Pokea SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Pokea SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Tuma SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Pokea SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Tuma SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Rekebisha mipangilio"</item>
+    <item msgid="736541391767350377">"Chora juu"</item>
+    <item msgid="5530815681721654194">"Fikia arifa"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Rekodi sauti"</item>
+    <item msgid="3493046322001257041">"Cheza sauti"</item>
+    <item msgid="136815868796597058">"Soma ubao klipu"</item>
+    <item msgid="5238692940326972503">"Rekebisha ubao klipu"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Fupi"</item>
     <item msgid="2560532955514699713">"Wastani"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Michoro)"</item>
     <item msgid="1340692776955662664">"Simu imekwama kwenye glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Imezimwa"</item>
+    <item msgid="675719912558941285">"Chora eneo la klipu lisilo mstatili kwa rangi ya bluu"</item>
+    <item msgid="1064373276095698656">"Angazia amri za michoro iliyojaribiwa kwa rangi ya kijani"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Imezimwa"</item>
+    <item msgid="2751513398307949636">"Kwenye skrini kama pau"</item>
+    <item msgid="8272260411216018353">"Kwenye skrini kama mistari"</item>
+    <item msgid="120512413928262547">"Katika adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Kiwango cha wastani"</item>
     <item msgid="4071574792028999443">"Hakuna mchakato wa mandari nyuma"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 1866849..ea1362f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -112,7 +112,7 @@
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Inaonekana kwa zote zilizokaribu na vifaa vya Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Inaonekana kwa zote zilizokaribu na vifaa vya Bluetooth"</string>
-    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"haionekani kwa vifaa vingine vya Bluetooth"</string>
+    <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Haionekani na vifaa vingine vyenye Bluetooth"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Inaonekana tu kwa vifaa vilivyolinganishwa"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Muda wa kuonekana"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Funga sauti ya upigaji simu"</string>
@@ -124,7 +124,7 @@
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Hakuna jina lililowekwa, inatumia jina la akaunti"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Chuja kupata vifaa"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Ipe jina jipya kompyuta ndoto"</string>
-    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Peana jina upya kwa simu"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Pea simu jina jipya"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Ipe jina jipya"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Tenganisha?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hii ikakata muunganisho wako na:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -209,7 +209,7 @@
     <string name="radio_info_gsm_disconnects_label" msgid="1683069665736339820">"Kukata muunganisho wa GSM:"</string>
     <string name="radio_info_current_network_label" msgid="3256402602440102610">"Mtandao wa sasa:"</string>
     <string name="radio_info_data_successes_label" msgid="4417894113689054945">"Ufanisi wa data:"</string>
-    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"ppp imepokelewa"</string>
+    <string name="radio_info_ppp_received_label" msgid="3345184342444878849">"ppp imepokea:"</string>
     <string name="radio_info_gsm_service_label" msgid="2082332114596916985">"Huduma ya GSM:"</string>
     <string name="radio_info_signal_strength_label" msgid="1931937920896925766">"Nguvu za mawimbi:"</string>
     <string name="radio_info_call_status_label" msgid="4896238900685510883">"Hali ya simu:"</string>
@@ -270,11 +270,11 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Hali ya ndege"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Zaidi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Mitandao isiyotumia waya"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Dhibiti Wi-Fi, Bluetooth, hali ya ndege, mitandao ya simu za mkononi na VPN"</string>
-    <string name="roaming" msgid="3596055926335478572">"Urandaji wa data"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Unganisha huduma ya data  wakati wa urandaji"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Unganisha huduma ya data wakati wa urandaji"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliacha mtandao wako wa nyumbani wa urandaji ukiwa umezimwa."</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Dhibiti Wi-Fi, Bluetooth, hali ya ndege, mitandao ya simu za mkononi na VPN"</string>
+    <string name="roaming" msgid="3596055926335478572">"Utumiaji data nje ya mtandao wako wa kawaida"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Unganisha huduma ya data  wakati niko nje ya mtandao wangu wa kawaida"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Unganisha huduma ya data wakati niko nje ya mtandao wangu wa kawaida"</string>
+    <string name="roaming_reenable_message" msgid="9141007271031717369">"Umepoteza muunganisho wa data kwa sababu uliondoka kwenye mtandao wako wa kawaida ukiwa umezima utumiaji data nje ya mtandao wa kawaida."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Iwashe"</string>
     <string name="roaming_warning" msgid="7625933694709170887">"Ukiruhusu data kupitia mitandao mingine, unaweza kupata gharama kubwa ya kupitia mitandao mingine!"</string>
     <string name="roaming_warning_multiuser" product="tablet" msgid="6458990250829214777">"Unaporuhusu data kupitia mitandao mingine, huenda ukatozwa gharama kubwa za matumizi ya nje!"\n\n"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
@@ -285,17 +285,17 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Tarehe na saa"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Weka tarehe na saa"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Weka tarehe, saa, ukanda wa saa na fomati"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Tarehe otomatiki &amp; saa"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Tarehe na saa za kiotomatiki"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Tumia muda uliopeanwa wa mtandao"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Tumia saa iliyopeanwa kwenye mtandao"</string>
-    <string name="zone_auto" msgid="334783869352026648">"Ukanda wa saa otomatiki"</string>
+    <string name="zone_auto" msgid="334783869352026648">"Ukanda wa saa kiotomatiki"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia ukanda wa saa uliopeanwa wa mtandao"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia ukanda wa saa uliopeanwa wa mtandao"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Tumia fomati ya saa 24."</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Tumia mpangilio wa saa 24"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Weka muda"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Chagua ukanda wa saa"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Weka tarehe"</string>
-    <string name="date_time_date_format" msgid="6951498879879281102">"Chagua mpangilio ya tarehe"</string>
+    <string name="date_time_date_format" msgid="6951498879879281102">"Chagua mpangilio wa tarehe"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Panga kialfabeti"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Panga kwa ukanda wa saa"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Tarehe"</string>
@@ -311,7 +311,9 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Andika maandishi ya kuonyeshwa kwenye skrini ya kufunga"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Onyesha maelezo ya mtumiaji kwenye skrini ya kufunga"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Maelezo ya mtumiaji"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"Ufikivu wa eneo"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Onyesha maelezo ya wasifu kwenye skrini iliyofungwa"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Maelezo ya wasifu"</string>
+    <string name="location_settings_title" msgid="4483843407328665068">"Ufikiaji mahali"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Usalama"</string>
     <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>
@@ -319,8 +321,8 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Usimbaji fiche wa kompyuta ndogo"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Simba simu"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Inahitaji PIN yenye nambari au nenosiri ili kusimbua kompyuta yako kibao kila unapoiwasha"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Inahitaji PIN yenye nambari au nenosiri ili kusimbua simu yako kila unapoiwasha"</string>
+    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua kompyuta yako kibao kila unapoiwasha"</string>
+    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua simu yako kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
     <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data yazo, vyombo vya habari na faili zingine. Ukisha simba kwenye kompyuta yako kibao, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya kiwandani, na kufuta data yako yote."\n\n"Usimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakiwa na data yao, vyombo vya habari na faili zingine. Ukisha simba kwenye simu yako, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua simu yako isipokuwa kwa kurejesha mipangilio ya kiwandani,na kufuta data yako yote"\n\n"Usimbaji fiche huchukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako kwenye chaji mpaka usimbaji fiche ukamilike. Ukiingilia mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
@@ -329,7 +331,7 @@
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Tafadhali ingiza chaja yako kisha ujaribu tena."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Hakuna PIN ya kufunga skrini au nenosiri"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN ya kifungio kwa skrini au nenosiri kabla kuanza usimbaji fiche."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Unahitaji kuweka PIN ya kufunga skrini au nenosiri kabla kuanza usimbaji fiche."</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"Simba?"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="4453629424172409792">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo kompyuta kibao itajiwasha mara kadhaa."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="5682944380460921880">"Uendeshaji usimbaji fiche hauwezi kutenduliwa na ukiukatiza, utapoteza data. Usimbaji fiche huchukua saa moja au zaidi, wakati huo simu itajiwasha mara kadhaa."</string>
@@ -342,7 +344,7 @@
     <string name="crypt_keeper_failed_summary" product="tablet" msgid="4478225241476039013">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye kompyuta yako kibao haiwezi kupatikana. "\n\n" Ili kuendelee kutumia kompyuta yako kibao, unahitaji kurejesha mipangilio ya kiwandani. Ukisha washa kompyuta yako kibao baada ya kurejesha, utakuwa na fursa ya kurejesha data yoyote iliyokuwa imechelezwa kwenye Akaunti yako ya Google."</string>
     <string name="crypt_keeper_failed_summary" product="default" msgid="3083477162766772532">"Usimbaji fiche umekatishwa na hauwezi kukamilika. Kutokana na hayo, data kwenye simu yako haziwezi kuonekana. "\n\n" Ili kuendelea kutumia simu yako, utahitaji urejesha mipangilio ya kiwandani. Utakapowasha simu yako baada ya kurejesha, utakuwa na fursa ya kurejesha data zozote ulizocheleza kwenye Akaunti yako ya Google."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Badili mbinu ya ingizo"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Chagua kifungio cha skrini"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Mbinu ya kufunga skrini?"</string>
     <string name="backup_lock_settings_picker_title" msgid="8530380598637963916">"Chagua kifungio cha hifadhi"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Kufunga skrini"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"badilisha kufunga kwa skrini"</string>
@@ -353,7 +355,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slaidi"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Hakuna salama"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Fungua Sura"</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>
@@ -364,7 +366,7 @@
     <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="5660014471997663139">"Slaidi"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Fungua Sura"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Kufungua kwa Uso"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Ruwaza"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Nenosiri"</string>
@@ -409,7 +411,16 @@
     <string name="lock_setup" msgid="3355847066343753943">"Usanidi umekamilika."</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Usimamizi wa kifaa"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Wasimamizi wa kifaa"</string>
-    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au zima wasimamizi wa kifaa"</string>
+    <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au uzime wasimamizi wa kifaa"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Washa Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -445,9 +456,9 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Batilisha ulinganishaji"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Tenganisha na ughari uoanishaji"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Chaguo…"</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Mahiri"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Mipangilio ya kina"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth mahiri"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"Ili kutazama vifaa, washa Bluetooth."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="4793562956642282639">"Ili uone vifaa, washa Bluetooth."</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>
@@ -484,12 +495,12 @@
     <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_display_settings_title" msgid="564299108014609382">"Uonyeshaji bila kutumia waya"</string>
+    <string name="wifi_display_settings_title" msgid="564299108014609382">"Vifaa visivyotumia waya"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ili kuona vifaa, washa uonyeshaji bila kutumia waya."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Uonyeshaji bila kutumia waya umezimwa kwa sababu Wi-Fi imezima."</string>
-    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Tafuta maonyesho"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Uonyeshaji pasiwaya umezimwa kwa sababu Wi-Fi imezima."</string>
+    <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Tafuta vifaa"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Inatafuta…"</string>
-    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Hakuna maonyesho ya karibu ya pasiwaya yalipatikana."</string>
+    <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Hakuna vifaa visivyotumia waya vilivyopatikana karibu"</string>
     <string name="wifi_display_paired_devices" msgid="7395326840730024303">"Maonyesho yaliyooanishwa"</string>
     <string name="wifi_display_available_devices" msgid="4558314642853513487">"Vifaa vinavyopatikana"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Inaunganisha"</string>
@@ -513,53 +524,60 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hazipatikani kwa sababu NFC imezimwa"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Wakati kipengele hiki ni kimewashwa, unaweza boriti maudhui ya programu kwa kifaa kingine cha NFC chenye uwezo kwa kusikilia vifaa karibu pamoja. Kwa mfano, unaweza boriti  kurasa za Kivinjari, videos za YouTube, Anwani za Watu, na zaidi. "\n" "\n" Leta tu vifaa pamoja (kawaida nyuma kwa nyuma) na kisha gusa kioo chako. Programu huamua nini inapata mwale."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Wakati kipengele hiki kimewashwa, unaweza kusambazia kifaa kingine chenye NFC  maudhui ya programu kwa kushika vifaa vyote vikiwa kimekaribiana. Kwa mfano, unaweza kusambaza kurasa za kivinjari, videos za YouTube, anwani za Watu, na mengine. "\n" "\n"Shika vifaa vikiwa vimekaribiana (kawaida pande za nyuma zikiwa zimeangaliana) na kisha uguse skrini yako. Programu huamua cha kusambaza."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ugunduzi wa huduma ya mtandao"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Ruhusu programu kwenye vifaa vingine kugundua programu kwenye kifaa hiki"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Mtandao-hewa"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Washa Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Mipangilio ya mitandao-hewa"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Washa Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Mipangilio ya Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Teua Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"inawasha Mtandao hewa..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Inazima Mtandao hewa..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Chagua Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Inawasha Wi-Fi..."</string>
+    <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">"Katika modi ya ndege"</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="3038290727701553612">"Nijulishe wakati kuna mtandao huru"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Usitumie mtandao wa Wi-Fi isipokuwa kama una muunganisho mzuri wa Mtandao"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Wacha Wi-Fi wazi wakati wa kulala"</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_scan_always_available" msgid="3470564139944368030">"Angalia Mitandao Inayopatikana"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Ruhusu huduma ya Google ya kutambua eneo na programu zingine ziangalie mitandao inayopatikana, hata wakati Wi-Fi imezimwa"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Sakinisha vyeti"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ili kuboresha usahihi wa eneo na kwa ajili ya madhumuni mengine, Google na programu nyingine huchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Programu zinaweza kuchanganua kutafuta mitandao iliyokaribu, hata wakati Wi-Fi imezimwa. Ikiwa hutaki hili litokee, nenda kwenye &gt; Uchanganuzi Mahiri unapatikana wakati wote."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Usionyeshe tena"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Washa Wi-Fi wakati wa kulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kulikuwa na hitilafu wakati wa kubadilisha mipangilio"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Uboreshaji wa Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Punguza matumizi ya betri wakati Wi-Fi inapowaka"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Uboreshaji wa Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Punguza matumizi ya betri wakati Wi-Fi imewashwa"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ongeza mtandao"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Mitandao-hewa"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Mitandao ya Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Kitufe cha kusukuma cha WSP"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Chaguo zaidi"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kiingilio cha Pin ya WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Moja kwa moja"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Kuweka Pin ya WPS"</string>
+    <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">"Mahiri"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Mipangilio ya kina"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Inatafuta mitandao ya Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Inatafuta mitandao ya Wi-Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Huna ruhusa ya kubadilisha mtandao wa Wi -Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Mtandao mwingine..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Zaidi"</string>
-    <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi otomatiki (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ili kukamilisha usanidi, kompyuta yako ndogo inahitaji ufikiaji katika Wi-Fi. Baada usanidi,  unaweza kubadili kati ya data ya simu na Wi-Fi."</string>
+    <string name="wifi_setup_wps" msgid="8128702488486283957">"Usanidi kiotomatiki (WPS)"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Ili kukamilisha usanidi, kompyuta yako ndogo inahitaji ufikiaji katika Wi-Fi. Baada ya usanidi,  unaweza kubadili kati ya data ya simu ya mkononi na Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Usanidi Uliolindwa na Wi-Fi"</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="7204827509934892103">"Bonyeza kitufe Kilicholindwa cha Usanidi cha Wi-Fi kwenye kiteua njia chako. Kinaweza kujulikana kama \"WPS\" au kuwa na nembo hii:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Ingiza pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili ili kukamilika."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Bonyeza kitufe Kilicholindwa cha Usanidi wa Wi-Fi kwenye kipanga njia chako. Huenda kinaitwa \"WPS\" au kina ishara 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="5754399645462924103">"Umeunganishwa kwa mtandao wa Wi-Fi wa <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Umeunganishwa kwenye mtandao-hewa wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS imeshindwa. Tafadhali jaribu tena baada ya dakika chache."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kipanga njia pasiwaya (WEP) hauauniwi."</string>
@@ -567,6 +585,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Imeshindwa kuthibitisha. Tafadhali jaribu tena."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Mtandao wa SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Ingiza SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Usalama"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Nguvu za mawimbi"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Hali"</string>
@@ -590,9 +609,12 @@
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</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_secured_first_item" msgid="4072076186051083451">"Imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_second_item" msgid="1326000076939056265">", imelindwa na <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Je, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Kataa"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Unganisha"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Sahau"</string>
@@ -604,12 +626,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Usiruke"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma."\n\n"Usanidi wa kompyuta ndogo unaweza kuhitaji huduma muhimu ya mtandao."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma."\n\n"Usanidi wa simu unaweza kuhitaji huduma muhimu ya mtandao."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ILANI: Kompyuta ndogo haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ILANI: Simu haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Kompyuta ndogo haikuweza kuunganika kwenye mtandao huu wa Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Simu haikuweza kuunganika kwenye mtandao huu wa Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Mtandao hewa mahiri"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Bendi ya masafa ya mtandao-hewa"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ILANI:Hadi uwe na muunganisho wa intaneti, kompyuta kibao yako haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ILANI: Hadi uwe na muunganisho wa intaneti, simu haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta ndogo haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Simu haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi mahiri"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Bendi ya masafa ya Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Bainisha masafa ya mazoea ya shughuli"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Kulikuwa na tatizo la kuweka bendi ya masafa."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Anwani ya MAC"</string>
@@ -625,14 +647,14 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Lango"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Urefu wa kiambishi awali cha mtandao"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Mtandao hewa Moja kwa moja"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi ya Moja kwa moja"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Taarifa ya kifaa"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Kumbuka muunganisho huu"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Tafuta vifaa"</string>
     <string name="wifi_p2p_menu_searching" msgid="2396704492143633876">"Inatafuta…"</string>
-    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Pea kifaa jina jipya"</string>
-    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa shiriki"</string>
-    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Vikundi vilivyokumbukwa"</string>
+    <string name="wifi_p2p_menu_rename" msgid="8448896306960060415">"Badilisha jina la kifaa"</string>
+    <string name="wifi_p2p_peer_devices" msgid="299526878463303432">"Vifaa vinavyoshirikiana"</string>
+    <string name="wifi_p2p_remembered_groups" msgid="3847022927914068230">"Vikundi vinavyokumbukwa"</string>
     <string name="wifi_p2p_failed_connect_message" msgid="8921447388048243547">"Haikuweza kuunganisha."</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"Imeshindwa kubadili jina la kifaa."</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"Tenganisha?"</string>
@@ -641,15 +663,15 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ghairi mwaliko?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Je, unataka kughairi mwaliko wa kuungana na <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Sahau kikundi hiki?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Sambaza intaneti ya Wi-Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inalemaza mtandao-hewa…"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot bebezi<xliff:g id="NETWORK_SSID">%1$s</xliff:g> amilifu"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Wi-Fi hotspot bebezi ina hitilafu"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Sanidi mtandao-hewa wa Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ubebezi wa Wi-Fi hotspot"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mtandao-hewa unaobebwa wa <xliff:g id="NETWORK_SSID">%1$s</xliff:g> unafanya kazi"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Hitilafu katika kusambaza intaneti ya WiFi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Weka intaneti ya Wi-Fi ya kusambazwa"</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="display_settings_title" msgid="1708697328627382561">"Onyesho"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
@@ -667,10 +689,10 @@
     <string name="media_volume_summary" msgid="5363248930648849974">"Badilisha sauti ya miziki na video"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Kengele"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Mipangilio ya sauti ya kiambatisho cha gati"</string>
-    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Toni za mguso wa pedi ya kupiga"</string>
-    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Gusa sauti"</string>
-    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Sauti ya kufunga skrini"</string>
-    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Tetema inapoguswa"</string>
+    <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Toa sauti vitufe vya kupiga vinapoguswa"</string>
+    <string name="sound_effects_enable_title" msgid="1171590821131077296">"Itoe sauti inapoguswa"</string>
+    <string name="lock_sounds_enable_title" msgid="450098505659399520">"Itoe sauti skrini inapofungwa"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Iteteme inapoguswa"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Ughairi wa kelele"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Muziki, video, michezo na media zingine"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Mlio wa simu na taarifa"</string>
@@ -701,25 +723,25 @@
     <string name="search_settings" msgid="1910951467596035063">"Tafuta"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Simamia mipangilio ya utafutaji na historia"</string>
     <string name="display_settings" msgid="7965901687241669598">"Onyesho"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Zungusha otomatiki skrini"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Skrini ijizungushe kiotomatiki"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
     <string name="brightness" msgid="2354961343555249270">"Ung\'avu"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Usingizi"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ya kutokuwa na shughuli"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
     <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
-    <string name="screensaver_settings_title" msgid="3349790120327233241">"Ndoto ya mchana"</string>
-    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wakati inapogatiwa au kulala na inachaji"</string>
+    <string name="screensaver_settings_title" msgid="3349790120327233241">"Hali Tulivu"</string>
+    <string name="screensaver_settings_summary_either_long" msgid="2458481525925378465">"Wakati imeambatishwa au iko kwenye hali tulivu na inachaji"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Yoyote kati ya hizi mbili"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Inapochaji"</string>
-    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Inapogatiwa"</string>
+    <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Wakati imeambatishwa"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ili kudhibiti kinachotendeka simu inapogatiwa na/au inapolala, washa Kuota Mchana."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wakati wa kuingia katika hali tulivu"</string>
+    <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Ili kudhibiti kinachotendeka wakati simu imeambatishwa na/au ikiwa imetulia, washa Hali Tulivu."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Wakati wa kuingia hali tulivu"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Anza sasa"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mipangilio"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
@@ -730,7 +752,7 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Kufunga SIM kadi"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Funga SIM kadi"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Inahitaji PIN ili kutumia simu"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Unahitaji PIN ili utumie simu"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Inahitaji PIN ili kutumia kompyuta ndogo"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"PIN iwe sharti ili kutumia simu"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
@@ -782,7 +804,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Nguvu za mawimbi"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Urandaji"</string>
     <string name="status_operator" msgid="2274875196954742087">"Mtandao"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Anwani ya MAC ya mtandao-hewa"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Anwani ya Wi-Fi ya MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Anwani ya Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Nambari ya Ufuatiliaji"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Hapatikani"</string>
@@ -791,17 +813,17 @@
     <string name="internal_memory" msgid="9129595691484260784">"Hifadhi ya ndani"</string>
     <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Hifadhi ya USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"Kadi ya SD"</string>
-    <string name="memory_available" msgid="5052397223077021181">"Inapatikana"</string>
+    <string name="memory_available" msgid="5052397223077021181">"Iliyo wazi"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Inapatikana (soma-tu)"</string>
     <string name="memory_size" msgid="6629067715017232195">"Jumla ya nafasi"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"Inahesabu..."</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data ya programu na maudhui ya vyombo vya habari)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data ya programu na maudhui ya media)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"media"</string>
-    <string name="memory_downloads_usage" msgid="3755173051677533027">"Vipakuzi"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Vipakuliwa"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Picha, video"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Sauti (muziki, toni milio, podikasti n.k)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Mengineyo."</string>
-    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data ya kache"</string>
+    <string name="memory_media_cache_usage" msgid="6704293333141177910">"Data iliyowekwa kwenye akiba"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Angua hifadhi iliyoshirikishwa"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"Ondoa kadi ya SD"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"Ondoa hifadhi ya ndani ya USB"</string>
@@ -816,8 +838,8 @@
     <string name="sd_format" product="default" msgid="2576054280507119870">"Futa kadi ya SD"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Futa data yote kwenye hifadhi ya ndani ya USB, kama vile muziki na picha"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Futa data yote kwenye kadi ya SD, kama vile muziki na picha"</string>
-    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Futa data ya kache?"</string>
-    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Hii itafuta data yote ya kache kwa programu zote."</string>
+    <string name="memory_clear_cache_title" msgid="5423840272171286191">"Ungependa kufuta data iliyo kwenye akiba?"</string>
+    <string name="memory_clear_cache_message" msgid="4550262490807415948">"Hii itafuta data iliyo kwenye akiba ya programu zote."</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"Kitendaji cha MTP au PTP ni amilifu"</string>
     <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"Angua hifadhi ya USB"</string>
     <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"Ondoa kadi ya SD?"</string>
@@ -832,14 +854,14 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Inaangua"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Shughuli ya kuanguliwa inaendelea"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Nafasi ya kuhifadhi inakwisha"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"Baadhi ya vipengee vya mfumo, kama vile ulandanishaji, huenda visifanye kazi vizuri. Jaribu kuweka nafasi kwa kufuta au kubanua vipengee, kama vile programu au maudhui ya vyombo vya habari."</string>
-    <string name="storage_menu_usb" msgid="5708207885333243384">"Muunganisho wa kompyuta ya USB"</string>
-    <string name="storage_title_usb" msgid="679612779321689418">"Muunganisho wa kompyuta ya USB"</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Baadhi ya vipengee vya mfumo, kama vile usawazishaji, huenda visifanye kazi vizuri. Jaribu kuongeza nafasi kwa kufuta au kubanua vipengee, kama vile programu au maudhui ya vyombo vya habari."</string>
+    <string name="storage_menu_usb" msgid="5708207885333243384">"Kuunganishwa kwenye kompyuta kwa USB"</string>
+    <string name="storage_title_usb" msgid="679612779321689418">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
     <string name="usb_mtp_title" msgid="3399663424394065964">"Kifaa cha media (MTP)"</string>
-    <string name="usb_mtp_summary" msgid="4617321473211391236">"Hukuwezesha kuhamisha faili za media kwenye Windows, au kwa kutumia Uhamishaji Faili ya Android kwenye Mac  (angalia www.android.com/filetransfer)"</string>
+    <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">"Inakuwezesha kuhamisha picha kwa kutumia programu ya kamera, na kuhamisha faili zozote kwenye kompyuta ambayo haiauni MTP"</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="storage_other_users" msgid="808708845102611856">"Watumiaji wengine"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Hali ya betri"</string>
@@ -871,6 +893,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN imewezeshwa"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN imelemazwa"</string>
     <string name="bearer" msgid="594270280031923558">"Mwenye"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Aina ya MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Thamani ya MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Futa APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN Mpya"</string>
     <string name="menu_save" msgid="8109345640668285399">"Hifadhi"</string>
@@ -881,14 +905,14 @@
     <string name="error_mcc_not3" msgid="4560171714156251661">"Sehemu ya MCC lazima iwe na nambari 3."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"Sehemu ya MNC lazima iwe na nambari 2 au 3."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Inarejeza mipangilio mbadala ya APN"</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Weka upya kwa chaguo-msingi"</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="master_clear_title" msgid="5907939616087039756">"Rejesha kwa data ya kiwandani"</string>
+    <string name="master_clear_title" msgid="5907939616087039756">"Rejesha data ya kiwandani"</string>
     <string name="master_clear_summary" product="tablet" msgid="4036344100254678429">"Futa data yote kwenye kompyuta ndoto"</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 zote kutoka kes hifadhi yako "<b>" ndani ya kompyuta ndogo"</b>", pamoja  na: "\n" "\n" "<li>" Google Account yako "</li>" "\n" "<li>" Mfumo na programu ya data na mipangilio "</li>" "\n" "<li>"programu Zilizopakuliwa "</li></string>
-    <string name="master_clear_desc" product="default" msgid="9165016501623540228">"Hii itafuta data zote kutoka kes hifadhi yako "<b>" ndani ya kompyuta ndogo"</b>", pamoja na: "\n" "\n" "<li>" Google Account yako "</li>" "\n" "<li>" Mfumo na programu ya data na mipangilio "</li>" "\n" "<li>"programu Zilizopakuliwa "</li></string>
-    <string name="master_clear_accounts" product="default" msgid="6412857499147999073">\n\n"Kwa sasa umeingia kwenye akaunti zinazofuata:"\n</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>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
@@ -898,12 +922,12 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Weka upya kompyuta ndogo"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Rejesha mipangilio ya mwanzoni ya simu"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Futa taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwei kutengua hatua hii!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Ungependa kufuta taarifa zako zote za kibinafsi na zilizopakuliwa? Hauwei kutendua hatua hii!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Futa kila kitu"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Mchoro wa kufungua"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Unahitaji kuchora mchoro wa kufungua ili kuthibitisha kurejesha mipangilio ya kiwandani."</string>
     <string name="master_clear_failed" msgid="7959646179737950703">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
-    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Seti upya?"</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"Iwekwe upya?"</string>
     <string name="media_format_title" product="nosdcard" msgid="3999653431422767156">"Futa hifadhi ya USB"</string>
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Futa kadi ya SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Hufuta data yote katika hifadhi ya USB"</string>
@@ -920,45 +944,45 @@
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha kwamba unataka kufuta kadi ya SD."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Inazuia USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Hotspot Bebezi"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Uzuiaji wa Bluetooth"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Shiriki intaneti kwa USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Mtandao-hewa unaobebwa"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Shiriki intaneti kwa Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Inazuia"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Uzuiaji &amp;bebezi ya hotspot"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Kushiriki na kusambaza intaneti"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Inazuia USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Shiriki intaneti kwa USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB imeunganishwa, angalia herufi"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Imezuia"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Haiwezi kuzuia wakati uhifadhi wa USB inatumika"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB haijaunganishwa"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Uzuiaji wa hitilafu ya USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Uzuiaji wa Bluetooth"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Hitilafu ya kushiriki intaneti kwa USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Shiriki intaneti kwa Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="8811610320942954709">"Shiriki muunganissho wa kompyuta hii"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Inashiriki muunganisho wa mtandao wa simu hii"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"Unashiriki intaneti ya simu hii"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"Kushiriki muunganisho wa mtandao wa komyputa na kifaa 1"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="1666736165420290466">"Unashiriki muunganisho wa mtandao wa simu na kifaa 1"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="1180765608259580143">"Unashiriki muunganisho wa mtandao wa kompyuta hii na vifaa hivi <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8248942539362173005">"Unashiriki muunganisho wa mtandao wa simu hii na vifaa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Haushiriki muunganisho wa mtandao wa kompyuta hii"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Haushiriki muunganisho wa mtandao wa simu hii"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="2093881379028235555">"Haujashiriki intaneti ya kompyuta hii"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="706860924389041342">"Haujashiriki intaneti ya simu hii"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Haijafungwa"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="6285122039489881969">"Haiwezi kuzuia kwa zaidi kuliko vifaa <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usaidizi"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mitandao ya simu"</string>
     <string name="location_title" msgid="1029961368397484576">"Mahali pangu"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu kutumia huduma ya eneo ya Google ili kukadiria eneo lako haraka. Data ya eneo lisilojulikana itakusanywa na kutumwa kwa Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Mahali pame tathminiwa na Mtandao hewa"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"Ruhusu programu zitumie huduma ya Google ya kukadiria mahali ili kukadiria mahali ulipo kwa haraka. Data ya mahali pasipojulikana itakusanywa na kutumwa kwa Google."</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Eneo limethibitishwa na Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Setileti za GPS"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Ruhusu programu kutumia GPS kwenye kompyuta yako kibao ili kuonyesha eneo lako"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"Ruhusu programu kutumia GPS kwenye simu yako ili kuonyesha eneo lako"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Ruhusu programu zitumie GPS kwenye kompyuta yako kibao ili kutambua mahali ulipo"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"Ruhusu programu zitumie GPS kwenye simu yako ili zitambue mahali ulipo"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Tumia GPS iliyosaidiwa"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Tumia seva ili kusaidia GPS (toa tiki ili kupunguza utumiaji wa mtandao)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Tumia seva ili kusaidia GPS (Toa tiki ili kuboresha utendajikazi wa GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Mahali na Utafutaji wa Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Ruhusu Google itumie eneo lako kuboresha matokeo ya utafutaji na huduma zingine"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Ufikivu katika eneo langu"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Ufikiaji eneo langu"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Ruhusu programu ambazo zimeomba idhini yako zitumie maelezo ya eneo lako"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Vyanzo vya eneo"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Kuhusu kompyuta ndogo"</string>
@@ -992,7 +1016,7 @@
     <string name="lock_settings_title" msgid="335025124489630932">"Usalama wa skrini"</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 ruwaza iliyohifadhiwa"</string>
+    <string name="lockpattern_need_to_unlock" msgid="757935356911054465">"Thibitisha mchoro uliohifadhiwa"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="4694973540770105678">"Jaribu tena:"</string>
     <string name="lockpattern_recording_intro_header" msgid="2063630508212535241">"Chora ruwaza ya kufungua:"</string>
     <string name="lockpattern_recording_intro_footer" msgid="1118579101409152113">"Bonyeza menyu upate usaidizi"</string>
@@ -1009,8 +1033,8 @@
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Inahitaji mchoro"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Lazima uchore umbo kufungua skrini"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Fanya mchoro uonekane"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Tetema inapoguswa"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Kitufe cha kuwasha/kuzima hufunga papo hapo"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Iteteme inapoguswa"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Zima kwa kitufe cha nishati"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Weka mchoro wa kufungua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Badilisha umbo la kufungua"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Jinsi ya kuchora mchoro wa kufungua"</string>
@@ -1023,7 +1047,7 @@
     <string name="applications_settings_summary" msgid="6683465446264515367">"Dhibiti programu, sanidi njia za mkato za kuzindua haraka"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Mipangilio ya programu"</string>
     <string name="install_applications" msgid="4872012136210802181">"Vyanzo visivyojulikana"</string>
-    <string name="install_unknown_applications" msgid="176855644862942064">"Ruhusu usanidi wa programu kutoka kwenye vyanzo visivyojulikana"</string>
+    <string name="install_unknown_applications" msgid="176855644862942064">"Ruhusu usanidi wa programu kutoka vyanzo visivyojulikana"</string>
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Kompyuta yako ndogo na data ya kibinafsi iko hatarini kushambuliwa na programu kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa kompyuta yako ndogo au kupoteza data ambayo inaweza kutokana kwa kutumia programu hizi."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Simu yako na data ya kibinafsi inaweza kushambuliwa na programu kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa simu yako au kupoteza data ambayo inaweza kusababishwa kutokana na kutumiwa na programu hizi."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Thibitisha programu"</string>
@@ -1032,15 +1056,15 @@
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
     <string name="storage_label" msgid="8700867073480107253">"Hifadhi"</string>
-    <string name="auto_launch_label" msgid="3012617472833815382">"Zindua kwa chaguo-msingi"</string>
+    <string name="auto_launch_label" msgid="3012617472833815382">"Zindua kama chaguo-msingi"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Chaguo-msingi"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Utangamanifu wa skrini"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Idhini"</string>
-    <string name="cache_header_label" msgid="1877197634162461830">"kache"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Futa kache"</string>
-    <string name="cache_size_label" msgid="7505481393108282913">"kache"</string>
+    <string name="cache_header_label" msgid="1877197634162461830">"Akiba"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"Futa akiba"</string>
+    <string name="cache_size_label" msgid="7505481393108282913">"Akiba"</string>
     <string name="controls_label" msgid="7611113077086853799">"Vidhibiti"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Lazimisha komesha"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Komesha kwa lazima"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Jumla"</string>
     <string name="application_size_label" msgid="8494609207373874267">"Programu"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"Programu ya hifadhi ya USB"</string>
@@ -1050,10 +1074,10 @@
     <string name="uninstall_text" msgid="3644892466144802466">"Ondoa"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Sakinusha kwa watumiaji wote"</string>
     <string name="install_text" msgid="884360662922471113">"Sakinisha"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Lemaza"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Wezesha"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Zima"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Washa"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Futa data"</string>
-    <string name="app_factory_reset" msgid="6635744722502563022">"Sanidua visasisho"</string>
+    <string name="app_factory_reset" msgid="6635744722502563022">"Sanidua Masasisho"</string>
     <string name="auto_launch_enable_text" msgid="2652825923953591251">"Umechagua kuzindua programu hii kwa mbadala kwa baadhi ya vitendo."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="3368654672141202604">"Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"Hakuna chaguo-misingi zilizowekwa."</string>
@@ -1065,17 +1089,18 @@
     <string name="sort_order_alpha" msgid="1410278099123670628">"Panga kwa jina"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Panga kwa ukubwa"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Onyesha huduma zinazoendeshwa"</string>
-    <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato ya kache"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Onyesha michakato iliyoakibishwa"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Weka upya mapendeleo ya programu"</string>
-    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uweke upya mapendeleo ya programu?"</string>
+    <string name="reset_app_preferences_title" msgid="6093179367325336662">"Ungependa kuweka upya mapendeleo ya programu?"</string>
     <string name="reset_app_preferences_desc" msgid="1118129530999596317">"Hii itaweka upya mapendeleo yote ya:"\n\n" "<li>"Programu zilizolemazwa"</li>\n" "<li>"Arifa za programu iliyolemazwa"</li>\n" "<li>"Programu chaguo-msingi za vitendo"</li>\n" "<li>"Uzuiaji wa data ya usuli ya programu"</li>\n\n" Hutapoteza data yoyote ya programu."</string>
     <string name="reset_app_preferences_button" msgid="2559089511841281242">"Weka upya programu"</string>
     <string name="manage_space_text" msgid="8852711522447794676">"Dhibiti nafasi"</string>
     <string name="filter" msgid="2018011724373033887">"Kichujio"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Chagua chaguzi za vichujio"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Zote"</string>
-    <string name="filter_apps_third_party" msgid="7786348047690140979">"Iliyopakuliwa"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"Inaendesha"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Imezimwa"</string>
+    <string name="filter_apps_third_party" msgid="7786348047690140979">"Zilizopakuliwa"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Zinazotumika"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Hifadhi ya USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Kwenye kadi ya SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Imelemazwa"</string>
@@ -1092,12 +1117,12 @@
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"Programu haikupatikana katika orodha ya programu za kompyuta zilizosakinishwa."</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"Haikuweza kufuta data ya programu."</string>
-    <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Sanidua visasisho?"</string>
+    <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"Unataka kusanidua masasisho?"</string>
     <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"Usasisho zote kwa mfumo wa programu ya Android zitasakinishuliwa."</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Futa data"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"Haikuweza kufuta data ya programu."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Programu hii haiwezi kufikia inayofuata kwa kompyuta yako ndogo:"</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Programu hii ya kompyuta inaweza kufikia ifuatayo kwenye simu yako:"</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"Programu hii inaweza kufikia yafuatayo kwenye simu yako:"</string>
     <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Programu hii inaweza kufikia yafuatayo kwenye kompyuta yako kibao. Ili kuboresha utendaji na kupunguza matumizi ya kumbukumbu, baadhi ya vibali hivi vinapatikana katika <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kwa sababu vinaendeshwa kwa mchakato sawa na <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Programu hii inaweza kufikia yafuatayo kwenye simu yako. Ili kuboresha utendaji na kupunguza matumizi ya kumbukumbu, baadhi ya vibali hivi vinapatikana katika <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> kwa sababu vinaendeshwa kwa mchakato sawa na <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> na  <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
@@ -1133,34 +1158,37 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Ukilemaza programu iliyojengewa ndani, programu nyingine zinaweza kuharibika. Data yako pia itafutwa."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Arifa zilemazwe?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ikiwa utazima arifa za programu hii, unaweza kosa kupata arifa na masasisho muhimu."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Oparesheni ya programu"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Inatumika"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Haijawahi kutumiwa)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Matumizi ya hifadhi"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tazama hifadhi iliyotumika na programu"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Huduma zinazoendeshwa"</string>
     <string name="runningservices_settings_summary" msgid="854608995821032748">"Onyesha na dhibiti huduma zinazoendeshwa kwa sasa"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Inawasha upya"</string>
-    <string name="cached" msgid="1059590879740175019">"Imenasa mchakato wa usuli"</string>
+    <string name="cached" msgid="1059590879740175019">"Mchakato unaoendelea chinichini ulioakibishwa"</string>
     <string name="no_running_services" msgid="2059536495597645347">"Hakuna uendeshaji."</string>
     <string name="service_started_by_app" msgid="818675099014723551">"Imeanzishwa na programu."</string>
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
-    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> Haina malipo"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> imetumiwa"</string>
+    <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> hujatumia"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"Umetumia <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory" msgid="6609961111091483458">"RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Mtumiaji: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Mtumiaji aliyeondolewa"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
-    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"Mchakato <xliff:g id="NUMPROCESS">%1$d</xliff:g> na huduma <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"Mchakato <xliff:g id="NUMPROCESS">%1$d</xliff:g> na huduma <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulikia na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
-    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> shughulika na <xliff:g id="NUMSERVICES">%2$d</xliff:g> huduma"</string>
-    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Programu inayoendeshwa"</string>
+    <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Michakato <xliff:g id="NUMPROCESS">%1$d</xliff:g> na huduma <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
+    <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Programu inayotumika"</string>
     <string name="no_services" msgid="7133900764462288263">"Sio amilifu"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"Huduma"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"Shughuli"</string>
     <string name="service_stop" msgid="6369807553277527248">"Acha"</string>
     <string name="service_manage" msgid="1876642087421959194">"Mipangilio"</string>
-    <string name="service_stop_description" msgid="9146619928198961643">"Huduma hii ilianzishwa na programu yake. Kuisitisha inaweza kusababisha programu kushindwa."</string>
+    <string name="service_stop_description" msgid="9146619928198961643">"Huduma hii ilianzishwa na programu yake. Kuisitisha kunaweza kuifanya programu iache kufanya kazi."</string>
     <string name="heavy_weight_stop_description" msgid="2979218727598321095">"Programu hii haiwezi kusitishwa kwa usalama. Ukiisitisha, unaweza kupoteza baadhi ya kazi yako ya sasa."</string>
     <string name="background_process_stop_description" msgid="5034773197139654588">"Hii ni utaratibu wa zamani ya programu ambayo bado inaendeshwa iwapo itahitajika tena. Huwa hakuna sababu ya kuisitisha."</string>
     <string name="service_manage_description" msgid="7050092269951613102">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g> Inatumika kwa sasa. Gusa Mipangilio kwa kuidhibiti."</string>
@@ -1170,10 +1198,10 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Komesha huduma ya mfumo?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Ukisitisha huduma hii, baadhi ya vipengele vya kompyuta yako ndogo vinaweza kuwacha kufanya kazi kwa usahihi mpaka uizime na kisha uwashe tena."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ukisitisha huduma hii, baadhi ya vipengele vya simu yako vinaweza kuwacha kufanya kazi kwa usahihi mpaka uizime na kisha uwashe tena."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Uingizaji lugha"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Uingizaji lugha"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Lugha, Kibodi na Sauti"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Lugha, Kibodi na Sauti"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Mipangilio ya lugha"</string>
-    <string name="keyboard_settings_category" msgid="8275523930352487827">"Kibodi &amp; mbinu za kuingizia"</string>
+    <string name="keyboard_settings_category" msgid="8275523930352487827">"Kibodi na mbinu za kuingiza hoja"</string>
     <string name="phone_language" msgid="8870144109924299673">"Lugha"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"Weka mibadala kiotomatiki"</string>
@@ -1182,8 +1210,8 @@
     <string name="auto_caps_summary" msgid="6358102538315261466">"Sentensi zianze kwa herufi kubwa"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"Akifisha kiotomaki"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Mipangilio ya kibodi halisi"</string>
-    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Bonyeza kibonye cha nafasi mara mbili ili uweke \".\""</string>
-    <string name="show_password" msgid="3001113966880559611">"Fanya manenosiri kuonekana"</string>
+    <string name="auto_punctuate_summary" msgid="4372126865670574837">"Bonyeza kibonye cha \'Space\' mara mbili ili uweke \".\""</string>
+    <string name="show_password" msgid="3001113966880559611">"Fanya manenosiri yaonekane"</string>
     <string name="ime_security_warning" msgid="4135828934735934248">"Mbinu hii ya ingizo huenda ikaweza kukusanya maandishi yote unayoandika, pamoja na data ya kibinafsi kama vile nenosiri na nambari za kadi ya mkopo. Inatoka kwa programu <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Tumia mbinu hii ya ingizo?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Kisasishaji hiki kinaweza kukusanya maandishi yote wakati unaangika, pamoja na data za kibinafsi kama nenosiri na namari za kadi ya mkopo. Inatoka kwa programu <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Tumia kisasishaji hiki?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Mipangilio"</string>
@@ -1212,6 +1240,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Neno:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Njia mkato:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Lugha:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Andika neno"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Mkato wa hiari"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hariri Neno"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hariri"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Futa"</string>
@@ -1252,16 +1282,19 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Mipangilio ya kibodi halisi"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Chaguo za wasanidi"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Weka chaguo kwa ajili ya maendeleo ya programu"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Chaguo la Wasanidi programu halipatikani kwa mtumiaji huyu"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Utatuzi wa USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Muundo wa kurekebisha wakati USB imeunganishwa"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Batilisha idhini za kurekebisha USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Ripoti za hitilafu za menyu ya nguvu"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Jumuisha chaguo katika menyu ya nguvu kwa kupeleka ripoti ya hitilafu"</string>
-    <string name="keep_screen_on" msgid="1146389631208760344">"Kaa ange"</string>
+    <string name="keep_screen_on" msgid="1146389631208760344">"Weka skrini ikiwa imewashwa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</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="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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Ruhusu mipangilio ya usanidi?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Mipangilio hii imekusudiwa kwa matumizi ya usanidi tu. Inaweza kusababisha kifaa chako na programu zilizoko kuvunjika au kutofanya kazi vizuri."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Thibitisha programu iliyo juu ya USB"</string>
@@ -1274,7 +1307,7 @@
     <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"Sharti programu iombe ruhusa ili kusoma kadi ya SD"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"Linda kadi ya SD?"</string>
     <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"Wakati kadi ya SD imelindwa, sharti programu ziombe ruhusa ya kusoma data kutoka kwenye hifadhi ya nje."\n\n"Baadhi ya programu zinawezakosa kufanya kazi hadi zisasishwe na wasanidi wake."</string>
-    <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kidude"</string>
+    <string name="gadget_picker_title" msgid="98374951396755811">"Chagua kitufe"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"Chagua wijeti"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"Unda wijeti na uruhusu ufikiaji?"</string>
     <string name="allow_bind_app_widget_activity_allow_bind" msgid="1584388129273282080">"Baada ya kuunda wijeti, <xliff:g id="WIDGET_HOST_NAME">%1$s</xliff:g> inaweza kufikia data yote inayoonyeshwa."</string>
@@ -1294,7 +1327,7 @@
     <string name="accessibility_services_title" msgid="2592221829284342237">"Huduma"</string>
     <string name="accessibility_system_title" msgid="7187919089874130484">"Mfumo"</string>
     <string name="accessibility_screen_magnification_title" msgid="7001782548715744981">"Ishara za ukuzaji"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu."\n\n"Unapokuwa umekuza, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole mbiwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Mgongo wa mara tatu wa ukuzaji unafanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kuabiri."</string>
+    <string name="accessibility_screen_magnification_summary" msgid="2380627654189671754">"Kipengele hiki kinapowashwa, unaweza kukuza na kufifiza kwa kugonga skrini mara tatu."\n\n"Unapokuwa umekuza, unaweza:"\n<ul><li>"Kupindua: Vuta vidole viwili au zaidi kwenye skrini."</li>\n<li>"Rekebisha kiwango cha ukuzaji: Bana vidole viwili au zaidi pamoja au uzitawanye."</li></ul>\n\n"Pia unaweza kukuza hali, unaweza kuvuta kidole chako ili kuchunguza sehemu mbalimbali za skrini. Inua kidole chako ili kurejea kwenye hali yako ya awali."\n\n"Dokezo: Kugonga mara tatu ili kukuza hufanya kazi kila mahali isipokuwa kwenye kibodi na upau wa kubadilisha sehemu za skrini."</string>
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Njia mkato ya ufikivu"</string>
     <string name="accessibility_global_gesture_preference_summary_on" msgid="6180927399052022181">"Imewashwa"</string>
     <string name="accessibility_global_gesture_preference_summary_off" msgid="8102103337813609849">"Imezimwa"</string>
@@ -1306,23 +1339,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Kitufe cha kuwasha au kuzima kinakata simu"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sema manenosiri"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Gusa na ushikilie kuchelewesha"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Boresha ufikiaji wavuti"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mipangilio"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Imewashwa"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Imezimwa"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Imeruhusiwa"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Hairuhusiwi"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Ruhusu"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Usiruhusu"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"tumia<xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> anaweza kukusanya maandishi yote unayoyaandika, isipokuwa nenosiri. Hii ni pamoja na data ya kibinafsi kama nambari za kadi za mikopo. Pia inaweza kukusanya data kuhusu kuathiriana kwako na kompyuta."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> anaweza kukusanya maandishi yote unayoyaandika, isipokuwa nenisiri. Hii ni pamoja na taarifa ya kibinafsi kama nambari za kadi za mikopo. Inaweza pia kukusanya data kuhusu kuathiriana kwako na simu."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"simamisha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Kugusa OK kutasimamisha <xliff:g id="SERVICE">%1$s</xliff:g> ."</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"Je, 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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Chunguza vitendo vyako"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Pokea arifa unapoingiliana na programu."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Ungependa kuzima <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Kugusa Sawa kutasimamisha <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Unahitaji msomaji wa skrini?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack hutoa majibu yaliyosemwa ili kuwasaidia watumiaji vipofu na wenye-kuona kidogo. Je, unataka kuisanidi bure kutoka kwa Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Je, unataka programu kusakinisha hati kutoka kwa Google ambazo zinafanya maudhui ya wavuti yao ipatikane?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hakuna maelezo yaliyotolewa."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mipangilio"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Betri"</string>
@@ -1336,14 +1364,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Inachaji"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Skrini imewezeshwa"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS kwa"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"mtandao-hewa"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Amka"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mawimbi ya mtandao wa simu ya mkononi"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"mtandao-hewa kwa wakati unaofaa"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"mtandao-hewa kwa wakati unaofaa"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fia kwa wakati unaofaa"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi wakati unaofaa"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Maelezo ya historia"</string>
     <string name="details_title" msgid="3792801565213935385">"Tumia maelezo"</string>
@@ -1351,9 +1379,9 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Rekebisha utumiaji wa nishati"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Furushi zilizojumuishwa"</string>
     <string name="power_screen" msgid="3023346080675904613">"Skrini"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Hali-tumizi ya seli"</string>
+    <string name="power_cell" msgid="6596471490976003056">"Wakati seli haitumiki"</string>
     <string name="power_phone" msgid="5392641106474567277">"Simu za sauti"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Kompyuta ndogo haina shughuli"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Simu haitumiki"</string>
@@ -1361,7 +1389,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Mandharimbele ya CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Weka chonjo"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Inaendesha Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Inaendesha Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Kompyuta ndogo"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Simu"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Data imetumwa"</string>
@@ -1370,11 +1398,11 @@
     <string name="usage_type_video" msgid="4295357792078579944">"Video"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Washa saa"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Muda bila mawimbi"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Lazimisha komesha"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Komesha kwa lazima"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Taarifa ya programu"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mipangilio ya App"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Mipangilio"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Mipangilio ya mtandao-hewa"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Mipangilio ya Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Mipangilio ya Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Betri iliyotumiwa na simu za sauti"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Betri inayotumiwa wakati kompyuta ndogo haina shughuli"</string>
@@ -1383,8 +1411,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Badili kwa gumzo ya ndege na okoa nishati katika maeneo ambayo hakuna mtandao wa simu ya mkononi"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Betri uliyotumiwa na kizinza na taa ya nyuma"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Punguza mwangaza wa skrini na/au muda wa kuisha wa skrini"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Betri imetumiwa na Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Zima Wi-Fi wakati hauitumii au wakati haipatikani"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Betri imetumiwa na Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Zima Wi-Fi wakati huitumii au wakati haipatikani"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Betri iliyotumiwa na Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Zima Bluetooth wakati hauitumii"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Jaribu kuunganisha kwa kifaa tofauti cha Bluetooth"</string>
@@ -1403,33 +1431,34 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kiingizaji cha sauti &amp; mipangilio ya kutoa nje"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tafuta sauti"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Baobonye la Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Hotuba"</string>
+    <string name="voice_category" msgid="1430370497125803904">"Usemi"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Kitambulizi cha sauti"</string>
-    <string name="recognizer_settings_title" msgid="432493301215113154">"Utafutaji wa Sauti"</string>
+    <string name="recognizer_settings_title" msgid="432493301215113154">"Tafuta kwa kuzungumza"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Mipangilio ya\"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Mipangilio ya maandishi kwa hotuba"</string>
-    <string name="tts_settings_title" msgid="1237820681016639683">"Matokeo ya matini-hotuba"</string>
+    <string name="tts_settings_title" msgid="1237820681016639683">"Kubadilisha maandishi hadi usemi"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tumia mipangilio yangu kila wakati"</string>
     <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_rate_title" msgid="6030550998379310088">"Kiwango cha usemaji"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maandishi"</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>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Huadhiri hali ya maandishi yaliyosemwa"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lugha"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha kwa maandishi yanayozungumzwa"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha inayolingana na yanayozungumzwa"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Sikiliza mfano"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Cheza onyesho fupi la usanisi usemaji"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Sakinisha data ya sauti"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sakinisha data ya sauti inayohitajika kwa usanidi usemaji"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"Sakinisha data ya sauti inayohitajika kuunganisha usemi"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"Sauti zinazohitajika kwa usanisi wa usemaji tayari zimesakinishwa vizuri"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"Mipangilio yako imebadilika. Huu ni mfano wa jinsi inavyosikika."</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"Injini uliyochagua haiwezi kuendeshwa."</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Sanidi"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chagua injini nyingine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Hotuba hii inawezesha injini huenda ikaweza kukusanya maandishi ambayo yatazungumziwa, ikijumlisha data ya kibinafsi ya nenosiri na namba ya kaddi ya mkopo. Inatoka kwa injini ya <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> Wezesha matumizi ya hotuba hii iliyowezeshwa ya injini?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Lugha hii inahitaji muunganisho wa mtandao unaofanya kazi kwa towe ya maandishi hadi sauti."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Injini"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> mipangilio"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> imewezeshwa"</string>
@@ -1447,17 +1476,17 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Injini inayofaa"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Kwa ujumla"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kidhibiti nishati"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Inasasisha mpangilio wa Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Inasasisha mpangilio wa Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Inasasisha mpangilio wa Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"Imewashawa"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"Imezimwa"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"Inawasha"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"Inazima"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
-    <string name="gadget_sync" msgid="858895763714222152">"Landanisha"</string>
+    <string name="gadget_sync" msgid="858895763714222152">"Sawazisha"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"Ung`avu <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"otomatiki"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"Imejaa"</string>
@@ -1471,49 +1500,52 @@
     <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"Sakinisha vyeti  kutoka kwa kadi ya SD"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"Futa stakabadhi"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string>
-    <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi aminifu"</string>
-    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vyako amilifu vya CA"</string>
+    <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi zinazoaminika"</string>
+    <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vya CA vinavyoaminika"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Aina ya hifadhi"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Inaweza kutumiwa na maunzi"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Programu pekee"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuchora mchoro wako wa kufungua ili kuthibitisha usakinishaji wa hati tambulishi."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Ingiza nenosiri ya hifadhi ya stakabadhi"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Nenosiri la sasa:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Ondoa maudhui yote?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Nenosiri lazima liwe na angalau vibambo 8."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Lazima nenosiri liwe na angalau herufi 8."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Nenosiri si sahihi."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Nenosiri batili. Una nafasi moja kabla ya kufutwa kwa hifadhi ya stakabadhi."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Nenosiri batili. unayo nafasi<xliff:g id="NUMBER">%1$d</xliff:g>moja kabla ya kufutwa kwa hifadhi ya stakabadhi."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Hifadhi ya stakabadhi imefutwa"</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Hifadhi ya stakabadhi haikuweza kufutwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN ya kifungio kwa skrini au nenosiri kabla ya kutumia hifadhi ya hati."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN ya kufunga skrini au nenosiri kabla ya kutumia hifadhi ya hati."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Kuweka nakala na kuweka mipangilio upya"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Kuweka nakala na kuweka mipangilio upya"</string>
-    <string name="backup_section_title" msgid="7952232291452882740">"Hifadhi&amp; rejeza"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Hifadhi nakala na urejeshe mipangilio ya kiwanda"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Hifadhi nakala na urejeshe mipangilio ya kiwanda"</string>
+    <string name="backup_section_title" msgid="7952232291452882740">"Hifadhi nakala rudufu na urejeshe"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Data za kibinafsi"</string>
-    <string name="backup_data_title" msgid="1239105919852668016">"Cheleza data yangu"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Cheleza data ya programu, manenosiri ya Wi-Fi, na mipangilio mingine kwa seva za Google"</string>
+    <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 inayohifadhi kwa sasa data iliyochelezwa"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Onyesha upya otomatiki"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati kusanidi upya programu, rejeza mipangilio iliyohifadhiwa na data"</string>
-    <string name="local_backup_password_title" msgid="3860471654439418822">"Nenosiri la chelezo ya eneo kazi"</string>
-    <string name="local_backup_password_summary_none" msgid="393503434408227110">"Chelezo kamili za eneo kazi hazijalindwa kwa sasa"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Wakati wa kusanidi upya programu, rejesha mipangilio na data ambazo zina nakala rudufu"</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 kubadilisha au kuondoa nenosiri la chelezo kamili za eneo kazi"</string>
     <string name="local_backup_password_toast_success" msgid="582016086228434290">"Nenosiri mpya la chelezo limewekwa"</string>
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Nenosiri jipya na uthibitisho havioani"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Imeshindwa kuweka nenosiri la chelezo"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Wacha kucheleza manenosiri, vialamisho, mipangilio mingine na data ya programu ya Wi-Fi, na ufute kumbukumbu zote katika seva ya Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Ungependa kuacha kuhifadhi nakala za manenosiri, alamisho, mipangilio mingine na data ya programu ya Wi-Fi, na ufute nakala zote kwenye seva za Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mipangilio za usimamizi wa kifaa"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Msimamizi wa kifaa"</string>
-    <string name="remove_device_admin" msgid="3596845261596451437">"Lemaza"</string>
+    <string name="remove_device_admin" msgid="3596845261596451437">"Zima"</string>
     <string name="select_device_admin_msg" msgid="2645509057946368094">"Wasimamizi wa kifaa"</string>
-    <string name="no_device_admins" msgid="702695100241728775">"Hakuna kifaa kinachopatikana cha msimamizi"</string>
-    <string name="add_device_admin_msg" msgid="6246742476064507965">"Amilisha usimamizi wa kifaa?"</string>
-    <string name="add_device_admin" msgid="7133327675884827091">"Wezesha"</string>
+    <string name="no_device_admins" msgid="702695100241728775">"Hakuna wasimamizi kifaa wanaopatikana"</string>
+    <string name="add_device_admin_msg" msgid="6246742476064507965">"Ungependa kuwasha usimamizi wa kifaa?"</string>
+    <string name="add_device_admin" msgid="7133327675884827091">"Washa"</string>
     <string name="device_admin_add_title" msgid="7705551449705676363">"Msimamizi wa kifaa"</string>
     <string name="device_admin_warning" msgid="2026747446313628233">"Uamilishaji wa msimamizi itaruhusu programu ya <xliff:g id="APP_NAME">%1$s</xliff:g> kufanya  uendeshi unaofuata:"</string>
     <string name="device_admin_status" msgid="4252975713178851910">"Msimamizi huyu ni amilifu na anaruhusu programu <xliff:g id="APP_NAME">%1$s</xliff:g> kutenda uendeshi ifuatayo:"</string>
@@ -1522,10 +1554,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Arifa"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Mlio na mtetemo wa simu"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Mfumo"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Usanidi wa mtandao-hewa"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Unganisha kwenye mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Inaunganisha kwa mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Umeunganishwa kwa mtandao wa hewa<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Usanidi wa Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Unganisha kwenye mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Inaunganisha kwenye mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Umeunganishwa kwenye mtandao wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Ongeza mtandao"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Hujaunganishwa"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ongeza mtandao"</string>
@@ -1547,22 +1579,22 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Inaunganisha…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Nenda kwa hatua inayofuata"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP haiauniwi."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Hauwezi kusanidi muunganisho wa EAP Wi-Fi wakati wa usanidi. Baada ya kusanidi, unaweza kufanya hivyo katika Mipangilio &amp;,mitandao ya bila waya."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Huwezi kusanidi muunganisho wa EAP Wi-Fi wakati wa usanidi. Baada ya kusanidi, unaweza kufanya hivyo katika Mipangilio &gt; mitandao isiyotumia waya."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kuunganisha kunaweza kuchukua dakika chache..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Gusa"<b>"Inayofuata"</b>" kuendelea na kuweka ."\n\n"Gusa"<b>"Nyuma"</b>" kuunganisha na mitandao mbalimbali ya Wi-Fi"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Gusa"<b>"Inayofuata"</b>" ili kuendelea na usanidi."\n\n"Gusa"<b>"Nyuma"</b>" ili kuunganisha kwenye mtandao tofauti wa Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Hitilafu ya usawazishaji."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Usawazishaji haukuwezekana"</string>
     <string name="sync_active" msgid="8476943765960863040">"Usawazishaji amilifu"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"Sawazisha"</string>
-    <string name="sync_is_failing" msgid="1591561768344128377">"Kwa sasa usawazishaji una shida. Utarudi baada ya muda mfupi."</string>
+    <string name="sync_is_failing" msgid="1591561768344128377">"Kwa sasa usawazishaji una tatizo. Utarudi baada ya muda mfupi."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Ongeza akaunti"</string>
     <string name="background_data" msgid="5779592891375473817">"Data ya maandhari nyuma"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"Programu za kompyuta zinaweza kulandanisha, kutuma, na kupokea data wakati wowote"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"Programu inaweza kusawazisha, kutuma, na kupokea data wakati wowote"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Lemaza data ya usuli?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Kulemaza data za usuli huongeza maisha ya betri na hupunguza utumiaji wa data. Programu zingine za kompyuta huenda bado zikatumia muunganisho wa data za usuli."</string>
-    <string name="sync_automatically" msgid="1682730255435062059">"Oto-landanisha programu ya  data"</string>
+    <string name="sync_automatically" msgid="1682730255435062059">"Sawazisha kiotomatiki programu ya data"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Kusawazishwa Kumewezeshwa"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Sawazisha Kumezimwa"</string>
     <string name="sync_error" msgid="5060969083117872149">"Hitilafu ya usawazishaji"</string>
@@ -1577,8 +1609,8 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Kalenda"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Anwani"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Karibu kwa ulandanishi wa Google!"</font>" "\n"Njia ya Google ya kulandanisha data ili kuruhusu ufikiaji wa anwani zako, miadi, na zaidi kutoka mahali popote ulipo."</string>
-    <string name="header_application_sync_settings" msgid="6205903695598000286">"Mipangilio ya kulandanisha programu"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Karibu kwa usawazishi wa Google!"</font>" "\n"Njia ya Google ya kusawazisha data ili kuruhusu ufikiaji wa anwani zako, miadi yako, na mengine kutoka mahali popote ulipo."</string>
+    <string name="header_application_sync_settings" msgid="6205903695598000286">"Mipangilio ya kusawazisha programu"</string>
     <string name="header_data_and_synchronization" msgid="5165024023936509896">"Usawazishaji data"</string>
     <string name="preference_change_password_title" msgid="8955581790270130056">"Badilisha nenosiri"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Mipangilio ya akaunti"</string>
@@ -1593,8 +1625,8 @@
     <string name="provider_label" msgid="7724593781904508866">"Usajili wa Push"</string>
     <!-- no translation found for sync_item_title (4782834606909853006) -->
     <skip />
-    <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Haiwezi kulandanisha kwa mikono"</string>
-    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Ulandanishaji wa kipengee hiki imelemazwa kwa sasa. Kubadilisha mpangilio huu, kw muda mfupi washa data ya usuli na kulandanisha otomatiki."</string>
+    <string name="cant_sync_dialog_title" msgid="8923508322291625282">"Huwezi kusawazisha mwenyewe"</string>
+    <string name="cant_sync_dialog_message" msgid="1938380442159016449">"Kwa sasa usawazishaji wa kipengee hiki umezimwa. Kubadilisha mpangilio huu, washa kwa muda data ya usuli na usawazishaji kiotomatiki."</string>
     <string name="wimax_settings" msgid="1574837328738396794">"Mipangilio ya 4G"</string>
     <string name="wimax_settings_summary" msgid="3207355006084135453">"Weka na udhibiti;i modem ya mtandao wa 4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Anwani ya 4G MAC"</string>
@@ -1617,6 +1649,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Programu ya utatuaji husubiri kitatuaji ili kuambatisha kabla ya kutekeleza"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Ingizo"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Uchoraji"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Kutunguliza kwa maunzi kulikoharakishwa"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Ufuatiliaji"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Modi makinifu imewezeshwa"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Mulika skrini wakati programu zinafanya uendeshaji mrefu kwenye mnyororo mkuu"</string>
@@ -1624,7 +1657,7 @@
     <string name="pointer_location_summary" msgid="840819275172753713">"Kuegeshwa kwa skrini ikionyesha data ya mguso ya sasa"</string>
     <string name="show_touches" msgid="1356420386500834339">"Onyesha miguso"</string>
     <string name="show_touches_summary" msgid="6684407913145150041">"Onyesha mwitikio wa kuonekana wa miguso"</string>
-    <string name="show_screen_updates" msgid="5470814345876056420">"Onyesha sasishi za sehemu"</string>
+    <string name="show_screen_updates" msgid="5470814345876056420">"Onyesha masasisho ya sehemu"</string>
     <string name="show_screen_updates_summary" msgid="2569622766672785529">"Angaza dirisha lote zitakaposasisha"</string>
     <string name="show_hw_screen_updates" msgid="5036904558145941590">"Onyesha sasisho za mtazamo wa GPU"</string>
     <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Kiwango cha maoni ndani ya madirisha wakati yanatolewa na GPU"</string>
@@ -1634,11 +1667,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kutoka kwa bora hadi mbovu zaidi: samawati, kijani, nyekundu hafifu, nyekundu"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Lemaza miekeleo ya HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Wezesha ufuatiliaji"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Teua ufuatiliaji uliowezeshwa"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Hakuna ufuatiliaji uliowezeshwa kwa sasa"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Ufuatiliaji <xliff:g id="NUM">%1$d</xliff:g> umewezeshwa kwa sasa"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Ufuatiliaji wote ambao umewezeshwa kwa sasa"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Wezesha ufuatiliaji wa OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Onyesha mipaka ya mpangilio"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Onyesha mipaka ya picha, kingo, nk."</string>
@@ -1648,9 +1676,9 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Lazimisha matumizi ya GPU kwa uchoraji wa 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Lazimisha 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Wezesha 4x MSAA katika programu za OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Tatua uendeshaji wa klipu usio mstatili"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Utungilizaji wa GPU ya wasifu"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Pima muda wa kutungiliza katika adp shell dumpys gfxinfo"</string>
-    <string name="window_animation_scale_title" msgid="6162587588166114700">"Kipimo cha uhiani wa Window"</string>
+    <string name="window_animation_scale_title" msgid="6162587588166114700">"Uhuishaji kwenye dirisha"</string>
     <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>
@@ -1660,27 +1688,29 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Kiwango cha mchakato wa mandari nyuma"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Onyesha ANR zote"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Onyesha kisanduku kidadisi cha Programu Haiitikii kwa programu za usuli"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Tumia WebView ya Jaribio"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Programu zitatumia (beta) mpya zaidi ya WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Matumizi ya data"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"Msururu wa matumizi ya data"</string>
-    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Urandaji wa data"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Kipindi cha kutumia data"</string>
+    <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Utumiaji data nje ya mtandao wako wa kawaida"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Zuia data ya mandhari nyuma"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Matumizitenganifu ya 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Onyesha matumizi ya Mtandao hewa"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Onyesha matumizi ya Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Onyesha matumizi ya Etherneti"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mitandao-hewa ya simu za mkononi"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Usawazishaji Data Kiotomatiki"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"badilisha mzunguko..."</string>
-    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Siku ya mwezi ya kuweka upya msururu wa matumizi ya data:"</string>
+    <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Siku katika mwezi ya kuweka kipindi kipya cha kutumia data:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Hakuna programu zilizotumia data wakati wa kipindi hiki."</string>
-    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Uga wa mbele"</string>
-    <string name="data_usage_label_background" msgid="3225844085975764519">"Mandhari nyuma"</string>
+    <string name="data_usage_label_foreground" msgid="4938034231928628164">"Ikifanya kazi kutoka mbele"</string>
+    <string name="data_usage_label_background" msgid="3225844085975764519">"Ikifanya kazi chinichini"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"Imedhibitiwa"</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Dhoofisha taarifa za simu?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Weka kikomo cha data ya simu ya mkononi"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Weka kikomo cha data ya 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Weka kikomo cha data cha 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Weka kikomo cha data cha Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Weka kikomo data cha Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Etherneti"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Simu ya mkononi"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1711,9 +1741,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango fulani kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na kompyuta kibao yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Muunganisho wako wa data ya simu utalemazwa wakati kiwango kilichobainishwa kitafikiwa. "\n\n" Kwa kuwa matumizi ya data yanapimwa na simu yako, na mtoa huduma wako anaweza kuhesabu matumizi kwa njia tofauti, zingatia kutumia kiwango cha kutunza."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Zuia data ya mandhari nyuma?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Ukizuia data ya usuli ya rununu, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe mtandao wa Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Ukizuia data ya maandharinyuma ya simu, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Ukizuia data ya maandharinyuma ya simu, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Ukizuia data ya chini kwa chini ya vifaa vya mkononi, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe mtandao wa Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Ukizuia data ya chini kwa chini kwa vifaa vya mkonon, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unawaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Ukizuia data ya chini kwa chini kwa vifaa vya mkononi, baadhi ya programu na huduma hazitafanya kazi isipokuwa uunganishwe kwenye mtandao wa Wi-Fi."\n\n"Mpangilio huu unawaathiri watumiaji wote kwenye simu hii."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"onyo"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"kiwango"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Programu zilizoondolewa"</string>
@@ -1723,10 +1753,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: karibu <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika, kama ilivyopimwa na kompyuta kibao yako. Hesabu ya matumizi ya data ya mtoa huduma wako inaweza kutofautiana."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: karibu <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika, kama ilivyopimwa na simu yako. Hesabu ya matumizi ya data ya mtoa huduma wako inaweza kutofautiana."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mitandao-hewa ya simu za mkononi"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Chagua mitandao ya Wi-Fi ambayo ni mitandao-hewa ya simu za mkononi. Programu zinaweza kuzuiliwa kutumia mitandao hii wakati ziko kwenye usuli. Pia programu zinaweza kutoa ilani kabla ya kutumia mitandao hii kwa upakuaji mkubwa."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Chagua mitandao ya Wi-Fi ambayo ni mitandao-hewa ya vifaa vya mkononi. Programu zinaweza kuzuiliwa kutumia mitandao hii wakati ziko chini kwa chini. Pia programu zinaweza kutoa ilani kabla ya kutumia mitandao hii kwa upakuaji mkubwa."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mitandao ya simu"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mitandao ya Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ili kuchagua mitandao-hewa ya simu za mkononi, wezesha Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Mitandao ya Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Ili kuchagua mitandao-hewa ya vifaa vya mkononi, washa Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Simu ya dharura"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Rudi kwa kupiga simu"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Jina"</string>
@@ -1739,7 +1769,7 @@
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"Cheti cha mtumiaji cha IPSec"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"Cheti cha IPSec CA"</string>
     <string name="vpn_ipsec_server_cert" msgid="6599276718456935010">"Cheti cha seva cha IPSec"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"Onyesha chaguo za kindani"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Onyesha chaguo za kina"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"Vikoa vya utafutaji DNS"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"Seva ya DNS(mfano 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Njia za usambazaji (mfano 10.0.0.0 / 8)"</string>
@@ -1766,8 +1796,8 @@
     <string name="vpn_missing_cert" msgid="7972907102570411501">"Cheti fulani hakipo. Tafadhali hariri wasifu."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Mfumo"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Mtumiaji"</string>
-    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Lemaza"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Wezesha"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Zima"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Washa"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"Ondoa"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"Wezesha mfumo wa cheti cha CA?"</string>
     <string name="trusted_credentials_disable_confirmation" msgid="8199697813361646792">"Lemaza mfumo wa cheti cha CA?"</string>
@@ -1784,34 +1814,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Ya kuruhusu"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Inatekeleza"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Watumiaji"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Wewe"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Watumiaji wengine"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Ongeza mtumiaji"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Amilifu"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Sio amilifu"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Watumiaji na wasifu"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Ongeza mtumiaji au wasifu"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Wasifu uliozuiwa"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Kabla uunde wasifu uliowekekwa vikwazo, utahitajika kuweka skrini iliyofungwa ili kulinda programu zako na data binafsi."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Weka ufunguo"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Haijasanidiwa"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Hajauweka - Wasifu uliozuiwa"</string>
     <string name="user_owner" msgid="3879126011135546571">"Mmiliki"</string>
+    <string name="user_you" msgid="1639158809315025986">"Wewe (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Jina la utani"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Ongeza"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Watumiaji wana programu na maudhui yao binafsi"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Unaweza kudhibiti ufikiaji kwa programu na maudhui kutoka kwenye akaunti yako"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Mtumiaji"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliozuiwa"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Ongeza mtumiaji mpya"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambazo wanaweza kugeuza kukufaa kwa programu zao binafsi, pazia, na kadhalika. watumia pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu."\n\n"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Unaweza kushiriki kifaa hiki na watu wengine kwa kuweka watumiaji wa ziada. Kila mtumiaji ana nafasi yake binafsi, ambayo anaweza kugeuza kumfaa kwa programu binafsi, pazia, na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kompyuta ndogo kama Wi-Fi ambayo inaathiri kila mtu."\n\n"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali idhini zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Baada ya kuweka mtumiaji mpya, mtu huyo anahitaji kupitia mchakato wa usanidi."\n\n"Mtumiaji yeyote anaweza kukubali ruhusa zilizosasishwa za programu kwa niaba ya watumiaji wengine wote."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Sandi mtumiaji sasa?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Hakikisha kuwa mtu wa kuchukua kompyuta ndogo na kusanidi nafasi yake yupo"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Sanidi sasa"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Siyo sasa"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Mmiliki wa kompyuta ndogo pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Futa <xliff:g id="USER_NAME">%1$s</xliff:g> kutoka kwenye kifaa hiki"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Mtumiaji mpya"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Wasifu mpya"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Futa mwenyewe?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Je, mtumiaji aondolewe?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Je, ungependa kuondoa wasifu?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Utapoteza nafasi na data yako kwenye kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Utapoteza nafasi na data yako kwenye simu hii. Huwezi kutendua kitendo hiki."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Nafasi hii ya mtumiaji na data zitatoweka katika kompyuta hii ndogo. Huwezi kutendua kitendo hiki."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Nafasi hii ya mtumiaji na data zitatoweka katika simu hii. Huwezi kutendua kitendo hiki."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Nafasi na data ya wasifu huu zitatoweka kwenye kompyuta hii kibao. Huwezi kutendua kitendo hiki."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Nafasi na data ya wasifu huu zitatoweka kwenye simu hii. Huwezi kutendua kitendo hiki."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Inaongeza mtumiaji mpya..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Futa mtumiaji"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Futa"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Mpangilio huu unaathiri watumiaji wote kwenye kompyuta hii ndogo."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Mpangilio huu unaathiri watumiaji wote kwenye simu hii."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Badilisha lugha"</string>
@@ -1822,4 +1868,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Kitambulisho cha Picha"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Matangazo ya simu"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chagua aina ya arifa za dharura za kuonyesha."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Vizuizi vya programu na maudhui"</string>
+    <string name="user_rename" msgid="8523499513614655279">"BADILISHA JINA"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Weka mipaka ya 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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Ruhusu marekebisho ya mipangilio na uoanishaji wa Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Ruhusu ubadilishaji wa data kompyuta ndogo inapogusa kifaa kingine"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Ruhusu ubadilishaji wa data simu inapogusa kifaa kingine"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Ufikiaji wa eneo"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Ruhusu programu zitumie maelezo yako ya eneo"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Nyuma"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Inayofuata"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Maliza"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Piga picha"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Chagua picha kutoka Matunzio"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 16eb8e7..324463d 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"ช้า"</item>
     <item msgid="1145554631248513562">"ปกติ"</item>
     <item msgid="7553665153391107454">"เร็ว"</item>
-    <item msgid="2538100882620724753">"เร็วมาก"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"ไม่มี"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ไม่มี"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"ไม่ระบุ"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"ไม่มี"</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">"ที่จัดเก็บข้อมูลอุปกรณ์ภายใน"</item>
     <item msgid="3738430123799803530">"การ์ด SD แบบนำออกได้"</item>
     <item msgid="4498124044785815005">"ให้ระบบเลือก"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"ตำแหน่งที่ตั้ง"</item>
+    <item msgid="255608127647030286">"ส่วนตัว"</item>
+    <item msgid="4588829735729884491">"การรับส่งข้อความ"</item>
+    <item msgid="8971765125227378270">"อุปกรณ์"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"ตำแหน่งคร่าวๆ"</item>
+    <item msgid="5789673140227507995">"ตำแหน่งโดยละเอียด"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"สั่น"</item>
+    <item msgid="3434165993711230924">"อ่านรายชื่อติดต่อ"</item>
+    <item msgid="616161687718081936">"แก้ไขรายชื่อติดต่อ"</item>
+    <item msgid="7638002295329050091">"อ่านประวัติการโทร"</item>
+    <item msgid="6546959730920410907">"แก้ไขประวัติการโทร"</item>
+    <item msgid="446877710771379667">"อ่านปฏิทิน"</item>
+    <item msgid="7674458294386319722">"แก้ไขปฏิทิน"</item>
+    <item msgid="8281201165558093009">"ค้นหา WiFi"</item>
+    <item msgid="8694611243479480497">"การแจ้งเตือน"</item>
+    <item msgid="7776439107987345446">"ค้นหาเซลล์"</item>
+    <item msgid="514615766544675057">"โทรเข้าโทรศัพท์"</item>
+    <item msgid="8181415497109310680">"อ่าน SMS"</item>
+    <item msgid="6816551144382117307">"เขียน SMS"</item>
+    <item msgid="4600463921908905030">"รับ SMS"</item>
+    <item msgid="5958926493289432745">"รับ SMS ฉุกเฉิน"</item>
+    <item msgid="4945269495221089540">"รับ MMS"</item>
+    <item msgid="5570472453573929087">"รับ WAP Push"</item>
+    <item msgid="7125408150230860501">"ส่ง SMS"</item>
+    <item msgid="7080337936612188061">"อ่าน ICC SMS"</item>
+    <item msgid="587124103118495063">"เขียน ICC SMS"</item>
+    <item msgid="2320577158869025503">"แก้ไขการตั้งค่า"</item>
+    <item msgid="1545733463471924009">"วาดด้านบน"</item>
+    <item msgid="3609046903962454582">"เข้าถึงการแจ้งเตือน"</item>
+    <item msgid="4671646036128214513">"กล้อง"</item>
+    <item msgid="1097324338692486211">"บันทึกเสียง"</item>
+    <item msgid="5031552983987798163">"เล่นเสียง"</item>
+    <item msgid="8374996688066472414">"อ่านคลิปบอร์ด"</item>
+    <item msgid="3045529469061083747">"แก้ไขคลิปบอร์ด"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"ตำแหน่ง"</item>
+    <item msgid="8677040780775113033">"ตำแหน่ง"</item>
+    <item msgid="1660743989948992916">"ตำแหน่ง"</item>
+    <item msgid="8791172739860195290">"สั่น"</item>
+    <item msgid="383413555642128046">"อ่านรายชื่อติดต่อ"</item>
+    <item msgid="3654594895269697313">"แก้ไขรายชื่อติดต่อ"</item>
+    <item msgid="7928393476362362538">"อ่านประวัติการโทร"</item>
+    <item msgid="6248591205254641116">"แก้ไขประวัติการโทร"</item>
+    <item msgid="6093344633066170692">"อ่านปฏิทิน"</item>
+    <item msgid="1334886368750347692">"แก้ไขปฏิทิน"</item>
+    <item msgid="1638204101698708656">"ตำแหน่ง"</item>
+    <item msgid="2154671955760380322">"การแจ้งเตือนโพสต์"</item>
+    <item msgid="4282477730595931828">"ตำแหน่ง"</item>
+    <item msgid="4891423912898525905">"โทรเข้าโทรศัพท์"</item>
+    <item msgid="626463821668200388">"รับ SMS/MMS"</item>
+    <item msgid="1237538540368797101">"ส่ง SMS/MMS"</item>
+    <item msgid="3986142739951490025">"รับ SMS/MMS"</item>
+    <item msgid="3984213795861739778">"รับ SMS/MMS"</item>
+    <item msgid="3656243523752472788">"รับ SMS/MMS"</item>
+    <item msgid="8105802370238551510">"รับ SMS/MMS"</item>
+    <item msgid="1407766984645388488">"ส่ง SMS/MMS"</item>
+    <item msgid="1530132603376027248">"รับ SMS/MMS"</item>
+    <item msgid="1188256962149204607">"ส่ง SMS/MMS"</item>
+    <item msgid="4218544235221631789">"แก้ไขการตั้งค่า"</item>
+    <item msgid="736541391767350377">"วาดด้านบน"</item>
+    <item msgid="5530815681721654194">"เข้าถึงการแจ้งเตือน"</item>
+    <item msgid="781213371706962767">"กล้อง"</item>
+    <item msgid="1720492593061838172">"บันทึกเสียง"</item>
+    <item msgid="3493046322001257041">"เล่นเสียง"</item>
+    <item msgid="136815868796597058">"อ่านคลิปบอร์ด"</item>
+    <item msgid="5238692940326972503">"แก้ไขคลิปบอร์ด"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"สั้น"</item>
     <item msgid="2560532955514699713">"ปานกลาง"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (กราฟิก)"</item>
     <item msgid="1340692776955662664">"ชุดรายการเรียกใน glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"เป็นแถบบนหน้าจอ"</item>
+    <item msgid="8272260411216018353">"เป็นเส้นบนหน้าจอ"</item>
+    <item msgid="120512413928262547">"ใน adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"ขีดจำกัดมาตรฐาน"</item>
     <item msgid="4071574792028999443">"ไม่มีกระบวนการพื้นหลัง"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 71d0f92..23c62ab 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"โหมดใช้งานบนเครื่องบิน"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"เพิ่มเติม..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ระบบไร้สายและเครือข่าย"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"จัดการ Wi-Fi, บลูทูธ, โหมดใช้งานบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"จัดการ WiFi, บลูทูธ, โหมดใช้งานบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"การโรมมิ่งข้อมูล"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"เชื่อมต่อบริการข้อมูลขณะโรมมิ่ง"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"พิมพ์ข้อความที่ต้องการให้แสดงบนหน้าจอล็อก"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"แสดงข้อมูลผู้ใช้บนหน้าจอล็อก"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"ข้อมูลผู้ใช้"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"แสดงข้อมูลโปรไฟล์บนหน้าจอล็อก"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"ข้อมูลโปรไฟล์"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"การเข้าถึงตำแหน่ง"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"ความปลอดภัย"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"โปรแกรมควบคุมอุปกรณ์"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"โปรแกรมควบคุมอุปกรณ์"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"ดูหรือปิดการใช้งานผู้ดูแลอุปกรณ์"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"การเข้าถึงการแจ้งเตือน"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"บลูทูธ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"เปิดบลูทูธ"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"บลูทูธ"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"จำการตั้งค่า"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"จอแสดงผลไร้สาย"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"หากต้องการดูอุปกรณ์ ให้เปิดจอแสดงผลไร้สาย"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"จอแสดงผลระบบไร้สายถูกปิดการใช้งานเนื่องจาก Wi-Fi ปิดอยู่"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"การแสดงผลแบบไร้สายถูกปิดใช้งานเนื่องจาก WiFi ปิดอยู่"</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"ค้นหาอุปกรณ์"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"กำลังค้นหา…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"ไม่พบอุปกรณ์ไร้สายในบริเวณใกล้เคียง"</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"เมื่อคุณลักษณะนี้เปิดอยู่ คุณสามารถส่งคลื่นสัญญาณของเนื้อหาของแอปพลิเคชันไปยังอุปกรณ์ที่สามารถใช้ NFC อีกอุปกรณ์หนึ่งได้โดยถืออุปกรณ์ไว้ใกล้กัน ตัวอย่างเช่น คุณสามารถส่งคลื่นสัญญาณของหน้าเบราว์เซอร์, วิดีโอ YouTube, ที่อยู่ติดต่อใน People และอื่นๆ"\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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"เปิด Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"การตั้งค่า Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"เปิด WiFi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"การตั้งค่า WiFi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"เลือก WiFi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"กำลังเปิด Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"กำลังปิด Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"เลือก WiFi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"กำลังเปิด WiFi…"</string>
+    <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="3038290727701553612">"แจ้งฉันเมื่อมีเครือข่ายเปิดให้ใช้งานได้"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"ใช้การสแกนได้เสมอ"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"ให้บริการตำแหน่งของ Google และแอปอื่นๆ สแกนหาเครือข่ายได้ แม้ในขณะที่ WiFi ปิดอยู่"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"ติดตั้งใบรับรอง"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"เพื่อปรับปรุงความแม่นยำของตำแหน่งและเพื่อวัตถุประสงค์อื่น Google และแอปอื่นๆ อาจสแกนหาเครือข่ายใกล้เคียงแม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"แอปอาจสแกนหาเครือข่ายใกล้เคียง แม้ในเวลาที่ปิด WiFi หากคุณไม่ต้องการให้สิ่งนี้เกิดขึ้น ให้ไปที่ ขั้นสูง &gt; การสแกนพร้อมใช้งานตลอดเวลา"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"ไม่ต้องแสดงข้อความนี้อีก"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"เปิด WiFi ระหว่างที่อยู่ในโหมดสลีป"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"มีปัญหาในการเปลี่ยนแปลงการตั้งค่า"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"การเพิ่มประสิทธิภาพ Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"ลดการใช้แบตเตอรี่เมื่อ Wi-Fi เปิดอยู่"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"การเพิ่มประสิทธิภาพ WiFi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"ลดการใช้แบตเตอรี่เมื่อ WiFi เปิดอยู่"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"เพิ่มเครือข่าย"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"เครือข่าย Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"เครือข่าย WiFi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"ปุ่มกด WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"ตัวเลือกอื่น"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"ข้อมูล Pin WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"WiFi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"เชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ไม่จำเครือข่าย"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"แก้ไขเครือข่าย"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"หากต้องการดูเครือข่ายที่ใช้ได้ ให้เปิด Wi-Fi"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"กำลังค้นหาเครือข่าย WiFi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"หากต้องการดูเครือข่ายที่ใช้ได้ ให้เปิด WiFi"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"กำลังค้นหาเครือข่าย WiFi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"คุณไม่ได้รับอนุญาตให้เปลี่ยนแปลงเครือข่าย WiFi"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"เครือข่ายอื่น…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"เพิ่มเติม"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"การตั้งค่าอัตโนมัติ (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"เพื่อดำเนินการตั้งค่าให้เสร็จสิ้น แท็บเล็ตของคุณต้องเข้าถึง WiFi หลังจากการตั้งค่า คุณจะสามารถสลับระหว่างข้อมูลมือถือและ WiFi ได้"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"เพื่อดำเนินการตั้งค่าให้เสร็จสิ้น แท็บเล็ตของคุณต้องเข้าถึง WiFi หลังจากการตั้งค่า คุณจะสามารถสลับระหว่างข้อมูลมือถือและ WiFi ได้"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"แสดงตัวเลือกขั้นสูง"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"การตั้งค่าการป้องกัน WiFi"</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="7204827509934892103">"กดปุ่ม \"การตั้งค่า WiFi แบบปลอดภัย\" บนเราเตอร์ของคุณ ปุ่มนี้อาจถูกเรียกว่า \"WPS\" หรือมีสัญลักษณ์นี้อยู่ด้วย:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"ป้อน PIN <xliff:g id="NUMBER">%1$s</xliff:g> บนเราเตอร์ WiFi ของคุณ การตั้งค่าอาจใช้เวลาถึงสองนาทีจึงจะเสร็จสิ้น"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"กดปุ่ม \"ตั้งค่าการป้องกัน WiFi\" บนเราเตอร์ของคุณ ปุ่มนี้อาจมีชื่อว่า \"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="5754399645462924103">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS กำลังดำเนินการอยู่และอาจใช้เวลาถึงสองนาทีจึงจะเสร็จสิ้น"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ล้มเหลว โปรดลองอีกครั้งหลังจากนี้สักครู่"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ไม่สนับสนุนการตั้งค่าความปลอดภัยของเราเตอร์ไร้สาย (WEP)"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"การตรวจสอบสิทธิ์ล้มเหลว โปรดลองอีกครั้ง"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"พบเซสชัน WPS อีกหนึ่งเซสชัน โปรดลองอีกครั้งในอีกสักครู่"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID เครือข่าย"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"ป้อน SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"ความปลอดภัย"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"ความแรงสัญญาณ"</string>
     <string name="wifi_status" msgid="4824568012414605414">"สถานะ"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">" ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ปฏิเสธ"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"เชื่อมต่อ"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"ไม่จำ"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"ไม่ข้าม"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าแท็บเล็ตอาจต้องใช้กิจกรรมเครือข่ายที่ใช้ปริมาณข้อมูลสูง"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"คำเตือน: การดำเนินการของคุณอาจมีค่าบริการเพิ่มเติมจากการใช้ข้อมูลของผู้ให้บริการ"\n\n"การตั้งค่าโทรศัพท์อาจต้องใช้กิจกรรมเครือข่ายที่ใ้ช้ปริมาณข้อมูลสูง"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"คำเตือน: แท็บเล็ตจะไม่สามารถยืนยันว่าซอฟต์แวร์ของคุณเป็นรุ่นปัจจุบัน"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"คำเตือน: โทรศัพท์จะไม่สามารถยืนยันว่าซอฟต์แวร์ของคุณเป็นรุ่นปัจจุบัน"</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"แท็บเล็ตไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"โทรศัพท์ไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi ขั้นสูง"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"ย่านความถี่ Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"คำเตือน: แท็บเล็ตจะไม่สามารถยืนยันได้ว่าซอฟต์แวร์ของคุณล่าสุดหรือไม่จนกว่าคุณจะมีการเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"คำเตือน: โทรศัพท์จะไม่สามารถยืนยันได้ว่าซอฟต์แวร์ของคุณล่าสุดหรือไม่จนกว่าคุณจะมีการเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"แท็บเล็ตไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"โทรศัพท์ไม่สามารถเชื่อมต่อกับเครือข่าย WiFi นี้"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"WiFi ขั้นสูง"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"ย่านความถี่ WiFi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"ระบุช่วงความถี่ของการดำเนินการ"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"เกิดปัญหาในการตั้งค่าย่านความถี่"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"ที่อยู่ Mac"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"เกตเวย์"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"ความยาวของหมายเลขเครือข่าย"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WiFi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"ข้อมูลอุปกรณ์"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"จำการเชื่อมต่อนี้"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"ค้นหาอุปกรณ์"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ยกเลิกข้อความเชิญหรือไม่"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"คุณต้องการยกเลิกข้อความเชิญเพื่อเชื่อมต่อกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> หรือไม่"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"ไม่จำกลุ่มนี้ใช่หรือไม่"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi ฮอตสปอตแบบพกพา"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"WiFi ฮอตสปอตแบบพกพา"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"กำลังเปิดฮอตสปอต…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"กำลังปิดฮอตสปอต…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ฮอตสปอตแบบพกพาได้ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ทำงานอยู่"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ข้อผิดพลาดของ Wi-Fi ฮอตสปอตแบบพกพา"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"ตั้งค่า WiFi ฮอตสปอต"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"ข้อผิดพลาดของ WiFi ฮอตสปอตแบบพกพา"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ตั้งค่า WiFi ฮอตสปอต"</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="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
@@ -727,7 +749,7 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"ในขณะวางอยู่บนแท่นชาร์จ"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ปิด"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"หากต้องการควบคุมสิ่งที่จะเกิดขึ้นเมื่อโทรศัพท์วางอยู่บนแท่นชาร์จและ/หรืออยู่ในโหมดสลีป ให้เปิด Daydream เอาไว้"</string>
-    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"เมื่อใดจึงจะ Daydream"</string>
+    <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"เข้าโหมด Daydream เมื่อ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"เริ่มเลย"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"การตั้งค่า"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"ความแรงสัญญาณ"</string>
     <string name="status_roaming" msgid="2638800467430913403">"โรมมิ่ง"</string>
     <string name="status_operator" msgid="2274875196954742087">"เครือข่าย"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"ที่อยู่ Wi-Fi Mac"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"ที่อยู่ MAC ของ WiFi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"ที่อยู่บลูทูธ"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"หมายเลขซีเรียล"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"ไม่ว่าง"</string>
@@ -807,7 +829,7 @@
     <string name="memory_media_usage" msgid="3738830697707880405">"สื่อ"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ดาวน์โหลด"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"ภาพ วิดีโอ"</string>
-    <string name="memory_music_usage" msgid="1363785144783011606">"เสียง (เพลง เสียงเรียกเข้า พอดคาสต์ ฯลฯ)"</string>
+    <string name="memory_music_usage" msgid="1363785144783011606">"เสียง (เพลง เสียงเรียกเข้า และอื่นๆ)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"เบ็ดเตล็ด"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"ข้อมูลในแคช"</string>
     <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"ยกเลิกการต่อเชื่อมที่เก็บข้อมูลที่ใช้ร่วมกัน"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"เปิดใช้งาน APN แล้ว"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"ปิดใช้งาน APN แล้ว"</string>
     <string name="bearer" msgid="594270280031923558">"ผู้ถือ"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"ประเภท MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"ค่า MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"ลบ APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN ใหม่"</string>
     <string name="menu_save" msgid="8109345640668285399">"บันทึก"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"ความช่วยเหลือ"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"เครือข่ายมือถือ"</string>
     <string name="location_title" msgid="1029961368397484576">"ตำแหน่งของฉัน"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"ตำแหน่งผ่าน WiFi และเครือข่ายมือถือ"</string>
-    <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปพลิเคชันใข้บริการระบุตำแหน่งของ Google ในการระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้กับ Google"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"ตำแหน่งที่กำหนดโดย Wi-Fi"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"ตำแหน่ง WiFi และเครือข่าย"</string>
+    <string name="location_neighborhood_level" msgid="5626515380188353712">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"ตำแหน่งที่กำหนดโดย WiFi"</string>
     <string name="location_gps" msgid="8392461023569708478">"ดาวเทียม GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ให้แอปพลิเคชันใช้ GPS ของแท็บเล็ตเพื่อระบุตำแหน่งของคุณ"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"ให้แอปพลิเคชันใช้ GPS ของโทรศัพท์เพื่อระบุตำแหน่งของคุณ"</string>
@@ -967,7 +991,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"ตำแหน่งและ Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"ให้ Google ใช้ตำแหน่งของคุณในการปรับปรุงผลการค้นหาและบริการอื่นๆ ให้ดียิ่งขึ้น"</string>
     <string name="location_access_title" msgid="7064108942964081243">"การเข้าถึงตำแหน่งของฉัน"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"ให้แอปพลิเคชันที่ได้ขออนุญาตจากคุณใช้ข้อมูลตำแหน่งของคุณ"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"ให้แอปที่ขออนุญาตแล้วใช้ข้อมูลตำแหน่งของคุณได้"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"ที่มาของตำแหน่ง"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"เกี่ยวกับแท็บเล็ต"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"เกี่ยวกับโทรศัพท์"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"ตัวกรอง"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"เลือกตัวเลือกตัวกรอง"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"ทั้งหมด"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"ปิดใช้งานแล้ว"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ดาวน์โหลดแล้ว"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ที่กำลังใช้งาน"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"ที่เก็บข้อมูล USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"หากคุณปิดใช้งานแอปพลิเคชันในตัว แอปพลิเคชันอื่นๆ อาจทำงานผิดพลาด และข้อมูลของคุณจะถูกลบด้วย"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"ปิดการแจ้งเตือนหรือไม่"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"หากคุณปิดการแจ้งเตือนสำหรับแอปพลิเคชันนี้ คุณอาจพลาดการแจ้งเตือนและการอัปเดตที่สำคัญ"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"การทำงานของแอป"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"กำลังดำเนินการ"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(ไม่เคยใช้)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"การใช้ที่เก็บข้อมูล"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"ดูที่จัดเก็บข้อมูลที่แอปพลิเคชันใช้"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"บริการที่ทำงานอยู่"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"คำ:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"ทางลัด:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"ภาษา:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"พิมพ์คำ"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ทางลัดที่เป็นตัวเลือก"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"แก้ไขคำ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"แก้ไข"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ลบ"</string>
@@ -1260,16 +1290,19 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"การตั้งค่าแป้นพิมพ์บนเครื่อง"</string>
     <string name="development_settings_title" msgid="215179176067683667">"สำหรับนักพัฒนาซอฟต์แวร์"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"ตั้งค่าตัวเลือกสำหรับการพัฒนาแอปพลิเคชัน"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์ไม่สามารถใช้ได้สำหรับผู้ใช้นี้"</string>
     <string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"รายงานข้อบกพร่องเกี่ยวกับเมนูเปิดปิด"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานข้อบกพร่อง"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"ยกเลิกการให้สิทธิ์การแก้ปัญหา USB"</string>
+    <string name="bugreport_in_power" msgid="4548816486587403971">"รายงานบั๊กเกี่ยวกับเมนูเปิดปิด"</string>
+    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานบั๊ก"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"เปิดหน้าจอค้าง"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"อนุญาตการตั้งค่าสำหรับการพัฒนาหรือไม่"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"การตั้งค่าเหล่านี้มีไว้สำหรับการพัฒนาเท่านั้น ซึ่งอาจทำให้อุปกรณ์และแอปพลิเคชันที่มีอยู่เสียหายหรือทำงานผิดพลาดได้"</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"ยืนยันแอปพลิเคชันผ่าน USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"พูดรหัสผ่าน"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"การหน่วงเวลาด้วยการแตะค้างไว้"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"การปรับปรุงการเข้าถึงเว็บให้ดีขึ้น"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"การตั้งค่า"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"เปิด"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ปิด"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"อนุญาต"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"ไม่อนุญาต"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"อนุญาต"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"ไม่อนุญาต"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"ใช้ <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> สามารถเก็บรวบรวมข้อความทั้งหมดที่คุณพิมพ์ไว้ได้ยกเว้นรหัสผ่าน โดยรวมถึงข้อมูลส่วนบุคคลต่างๆ เช่น หมายเลขบัตรเครดิต และยังสามารถเก็บข้อมูลเกี่ยวกับการโต้ตอบระหว่างคุณกับแท็บเล็ตได้ด้วย"</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> สามารถเก็บรวบรวมข้อความทั้งหมดที่คุณพิมพ์ไว้ได้ยกเว้นรหัสผ่าน โดยรวมถึงข้อมูลส่วนบุคคลต่างๆ เช่น หมายเลขบัตรเครดิต และยังสามารถเก็บข้อมูลเกี่ยวกับการโต้ตอบระหว่างคุณกับโทรศัพท์ได้ด้วย"</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"หยุด <xliff:g id="SERVICE">%1$s</xliff:g> หรือไม่"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"การแตะ \"ตกลง\" จะเป็นการหยุด <xliff:g id="SERVICE">%1$s</xliff:g>"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"สังเกตการทำงานของคุณ"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"รับการแจ้งเตือนเมื่อคุณกำลังโต้ตอบกับแอปหนึ่ง"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"หยุด <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"การแตะ \"ตกลง\" จะเป็นการหยุด <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"ไม่ได้ติดตั้งบริการใดไว้"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"ต้องใช้โปรแกรมอ่านหน้าจอหรือไม่"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack มีการตอบสนองด้วยเสียงเพื่อช่วยเหลือผู้พิการทางสายตาและผู้มีปัญหาทางสายตา คุณต้องการติดตั้งแอปพลิเคชันฟรีนี้จาก Android Market หรือไม่"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"คุณต้องการให้แอปพลิเคชันติดตั้งสคริปต์จาก Google เพื่อให้เข้าถึงเนื้อหาเว็บได้มากขึ้นหรือไม่"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"ไม่มีคำอธิบาย"</string>
     <string name="settings_button" msgid="3006713718908152930">"การตั้งค่า"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"แบตเตอรี่"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"กำลังชาร์จ"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"เปิดใช้หน้าจอ"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"เปิดใช้ GPS"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"WiFi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"เปิดหน้าจอค้าง"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"สัญญาณเครือข่ายมือถือ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"เวลาการทำงานของอุปกรณ์"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"เวลาเปิดใช้ Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"เวลาเปิดใช้ Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"เวลาเปิดใช้ WiFi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"เวลาเปิดใช้ WiFi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"รายละเอียดประวัติ"</string>
     <string name="details_title" msgid="3792801565213935385">"ใช้รายละเอียด"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"ปรับการใช้พลังงาน"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"แพ็คเก็จที่รวมมาด้วย"</string>
     <string name="power_screen" msgid="3023346080675904613">"หน้าจอ"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"บลูทูธ"</string>
     <string name="power_cell" msgid="6596471490976003056">"การไม่ใช้งานเครือข่าย"</string>
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"ส่วนหน้าของ CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"ทำงานตลอดเวลา"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"การใช้งาน Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"การใช้งาน WiFi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"แท็บเล็ต"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"โทรศัพท์"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"ส่งข้อมูลแล้ว"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"ข้อมูลแอปพลิเคชัน"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"การตั้งค่าแอปพลิเคชัน"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"การตั้งค่าหน้าจอ"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"การตั้งค่า Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"การตั้งค่า WiFi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"การตั้งค่าบลูทูธ"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"แบตเตอรี่ที่ใช้โดยการโทรด้วยเสียง"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"แบตเตอรี่ที่ใช้เมื่อแท็บเล็ตไม่ได้ทำงาน"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"เปลี่ยนเป็นโหมดใช้งานบนเครื่องบินเพื่อประหยัดพลังงานในบริเวณที่ไม่มีสัญญาณ"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"แบตเตอรี่ที่ใช้โดยจอแสดงผลและแบ็คไลท์"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"ลดความสว่างและ/หรือระยะหมดเวลาของหน้าจอ"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"แบตเตอรี่ที่ใช้โดย Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"ปิด WiFi เมื่อไม่ได้ใช้หรือเมื่อใช้งานไม่ได้"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"แบตเตอรี่ที่ใช้โดย WiFi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"ปิด WiFi เมื่อไม่ได้ใช้หรือเมื่อใช้งานไม่ได้"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"แบตเตอรี่จากการใช้บลูทูธ"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"ปิดบลูทูธเมื่อไม่ใช้งาน"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"ลองเชื่อมต่อกับอุปกรณ์บลูทูธอื่น"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"กำหนดค่า"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"เลือกเครื่องมืออื่น"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"โปรแกรมสังเคราะห์เสียงนี้อาจเก็บข้อความทั้งหมดที่ได้ยิน รวมถึงข้อมูลส่วนบุคคล เช่น รหัสผ่านและหมายเลขบัตรเครดิต โปรแกรมนี้มาจากโปรแกรม <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> คุณต้องการเปิดใช้งานโปรแกรมสังเคราะห์เสียงนี้หรือไม่"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"ภาษานี้ต้องใช้การเชื่อมต่อเครือข่ายซึ่งใช้การได้สำหรับการแปลงข้อความเป็นเสียงพูด"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"โปรแกรม"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"การตั้งค่า <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"เปิดใช้งาน <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> แล้ว"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"เครื่องมือที่ต้องการ"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"ทั่วไป"</string>
     <string name="gadget_title" msgid="5519037532720577836">"การควบคุมพลังงาน"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"กำลังอัปเดตการตั้งค่า Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"กำลังอัปเดตการตั้งค่า WiFi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"กำลังอัปเดตการตั้งค่าบลูทูธ"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"เปิด"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"ปิด"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"กำลังเปิด"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"กำลังปิด"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"WiFi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"WiFi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"บลูทูธ"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ซิงค์"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"นำใบรับรองทั้งหมดออก"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"ประเภทพื้นที่เก็บข้อมูล"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ใช้ฮาร์ดแวร์"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"ซอฟต์แวร์เท่านั้น"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"การสำรองและคืนค่าข้อมูล"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"ข้อมูลส่วนตัว"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"สำรองข้อมูลของฉัน"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"สำรองข้อมูลแอปพลิเคชัน รหัสผ่าน WiFi และการตั้งค่าอื่นๆ ไปยังเซิร์ฟเวอร์ Google"</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="auto_restore_title" msgid="5397528966329126506">"คืนค่าอัตโนมัติ"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"รหัสผ่านใหม่และการพิมพ์ยืนยันไม่ตรงกัน"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"ไม่สามารถตั้งรหัสผ่านสำหรับการสำรองข้อมูล"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"หยุดการสำรองข้อมูลรหัสผ่าน WiFi บุ๊กมาร์ก การตั้งค่าอื่นๆ และข้อมูลแอปพลิเคชัน รวมทั้งลบสำเนาทั้งหมดบนเซิร์ฟเวอร์ของ Google หรือไม่"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"หยุดการสำรองข้อมูลรหัสผ่าน WiFi, บุ๊กมาร์ก, การตั้งค่าอื่นๆ และข้อมูลแอปพลิเคชัน รวมทั้งลบสำเนาทั้งหมดบนเซิร์ฟเวอร์ของ Google หรือไม่"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"การตั้งค่าการควบคุมอุปกรณ์"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"โปรแกรมควบคุมอุปกรณ์"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"ปิดการใช้งาน"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"การแจ้งเตือน"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"มีเสียงเรียกเข้าและสั่น"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"ระบบ"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"ตั้งค่า Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"เชื่อมต่อกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"กำลังเชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"เชื่อมต่อกับเครือข่าย Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"ตั้งค่า WiFi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"กำลังเชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"เพิ่มเครือข่าย"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ไม่เชื่อมต่อ"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"เพิ่มเครือข่าย"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"กำลังเชื่อมต่อ…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"ไปที่ขั้นตอนถัดไป"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"ไม่สนับสนุน EAP"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"คุณไม่สามารถกำหนดค่าการเชื่อมต่อ EAP WiFi ในขณะตั้งค่าได้ หลังจากการตั้งค่า คุณสามารถกำหนดค่าการเชื่อมต่อนี้ได้ในการตั้งค่า &gt; ระบบไร้สายและเครือข่าย"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"คุณไม่สามารถกำหนดค่าการเชื่อมต่อ EAP WiFi ในขณะตั้งค่าได้ หลังจากการตั้งค่า คุณสามารถกำหนดค่าการเชื่อมต่อนี้ได้ในการตั้งค่า &gt; ระบบไร้สายและเครือข่าย"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"การเชื่อมต่ออาจใช้เวลาสักครู่..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป"\n\n"แตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย Wi-Fi อื่น"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป"\n\n"แตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย WiFi อื่น"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"เปิดใช้งานการซิงค์แล้ว"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ปิดใช้งานการซิงค์แล้ว"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"ข้อผิดพลาดในการซิงค์"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"แอปฯ ที่ถูกแก้จะรอให้เครื่องซ่อมแซมเพิ่มก่อนทำงาน"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"อินพุต"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"การวาดภาพ"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"การแสดงผลที่มีการเร่งด้วยฮาร์ดแวร์"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"กำลังตรวจสอบ"</string>
     <string name="strict_mode" msgid="1938795874357830695">"เปิดใช้งานโหมดเข้มงวด"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"แสดงหน้าจอเมื่อแอปพลิเคชันทำงานในชุดข้อความหลักนาน"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"จากดีที่สุดไปหาแย่ที่สุด: ฟ้า เขียว แดงอ่อน แดง"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"ปิดใช้งานการวางซ้อน HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"เปิดใช้งานร่องรอย"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"เลือกร่องรอยที่เปิดใช้งาน"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"ไม่มีร่องรอยที่เปิดใช้งานอยู่ในขณะนี้"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"เปิดใช้งานร่องรอย <xliff:g id="NUM">%1$d</xliff:g> รายการอยู่ในขณะนี้"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"ร่องรอยทั้งหมดที่เปิดใช้งานในขณะนี้"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"เปิดใช้ร่องรอยใน OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"แสดงขอบของการจัดวาง"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"ต้องใช้ GPU สำหรับการวาดภาพ 2 มิติ"</string>
     <string name="force_msaa" msgid="7920323238677284387">"บังคับใช้ 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"เปิดใช้งาน 4x MSAA ในแอปพลิเคชัน OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"แก้ปัญหาการทำงานของคลิปที่ไม่ใช่สี่เหลี่ยม"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"การแสดงผล GPU ตามโปรไฟล์"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"วัดเวลาที่ใช้แสดงผลใน adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"ขนาดหน้าต่างภาพเคลื่อนไหว"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"อัตราการสลับภาพเคลื่อนไหว"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"ความเร็วตามผู้สร้างกำหนด"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"ขีดจำกัดกระบวนการพื้นหลัง"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"แสดง ANR ทั้งหมด"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"แสดงหน้าต่างแอปฯไม่ตอบสนองสำหรับแอปฯพื้นหลัง"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"ใช้ WebView รุ่นทดลอง"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"แอปจะใช้ WebView ใหม่ล่าสุด (เบต้า)"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"การใช้ข้อมูล"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"รอบการใช้ข้อมูล"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"การโรมมิ่งข้อมูล"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"จำกัดข้อมูลแบ็กกราวด์"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"แยกการใช้งาน 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"แสดงการใช้ Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"แสดงการใช้ WiFi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"แสดงการใช้งานอีเทอร์เน็ต"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"ฮอตสปอตเคลื่อนที่"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"ซิงค์ข้อมูลอัตโนมัติ"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"ตั้งค่าขีดจำกัดของข้อมูลมือถือ"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"ตั้งค่าขีดจำกัดข้อมูลของ 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"ตั้งค่าขีดจำกัดข้อมูลของ 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"ตั้งค่าขีดจำกัดของข้อมูล Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"ตั้งค่าขีดจำกัดข้อมูล WiFi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"WiFi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"อีเทอร์เน็ต"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"มือถือ"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยแท็บเล็ตของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"การเชื่อมต่อข้อมูลผ่านมือถือของคุณจะถูกปิดใช้งานเมื่อครบจำนวนจำกัดที่ระบุไว้"\n\n"เนื่องจากการใช้งานข้อมูลถูกวัดปริมาณด้วยโทรศัพท์ของคุณ และผู้ให้บริการของคุณอาจมีการบันทึกปริมาณการใช้งานที่แตกต่างออกไป ดังนั้น โปรดเลือกวิธีที่ปลอดภัย"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"ต้องการจำกัดข้อมูลแบ็กกราวด์หรือไม่"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"หากคุณจำกัดข้อมูลแบ็กกราวด์บนมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานจนกว่าคุณจะเชื่อมต่อกับเครือข่าย WiFi"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"หากคุณจำกัดข้อมูลแบ็กกราวด์บนมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานจนกว่าคุณจะเชื่อมต่อกับเครือข่าย WiFi"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"หากคุณจำกัดข้อมูลพื้นหลังของมือถือ แอปพลิเคชันและบริการบางอย่างจะไม่ทำงานเว้นแต่คุณจะเชื่อมต่อกับเครือข่าย WiFi"\n\n"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"คำเตือน"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"ขีดจำกัด"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"แอปพลิเคชันที่นำออก"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่แท็บเล็ตวัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: ใช้แล้วประมาณ <xliff:g id="TOTAL">%1$s</xliff:g> ตามที่โทรศัพท์วัดได้ ผู้ให้บริการอาจมีรายละเอียดการใช้ต่างจากนี้"</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"ฮอตสปอตเคลื่อนที่"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"เลือกเครือข่าย WiFi ที่เป็นฮอตสปอตเคลื่อนที่ สามารถจำกัดแอปพลิเคชันจากการใช้เครือข่ายเหล่านี้ได้เมื่ออยู่ในพื้นหลัง นอกจากนี้ แอปพลิเคชันอาจแจ้งเตือนก่อนที่จะใช้เครือข่ายเหล่านี้ในการดาวน์โหลดไฟล์ขนาดใหญ่"</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"เลือกเครือข่าย WiFi ที่เป็นฮอตสปอตเคลื่อนที่ สามารถจำกัดแอปพลิเคชันจากการใช้เครือข่ายเหล่านี้ได้เมื่ออยู่ในพื้นหลัง นอกจากนี้ แอปพลิเคชันอาจแจ้งเตือนก่อนที่จะใช้เครือข่ายเหล่านี้ในการดาวน์โหลดไฟล์ขนาดใหญ่"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"เครือข่ายมือถือ"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"เครือข่าย WiFi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"หากต้องการเลือกฮอตสปอตเคลื่อนที่ ให้เปิด WiFi"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"เครือข่าย WiFi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"หากต้องการเลือกฮอตสปอตเคลื่อนที่ ให้เปิด WiFi"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"หมายเลขฉุกเฉิน"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"กลับสู่การโทร"</string>
     <string name="vpn_name" msgid="4689699885361002297">"ชื่อ"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"อนุญาต"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"บังคับใช้งาน"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"ผู้ใช้"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"คุณ"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"ผู้ใช้รายอื่นๆ"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"เพิ่มผู้ใช้"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"ใช้งานอยู่"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"ไม่ได้ใช้งาน"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"ผู้ใช้และโปรไฟล์"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"เพิ่มผู้ใช้หรือโปรไฟล์"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"โปรไฟล์ที่ถูกจำกัด"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"ก่อนที่คุณจะสามารถสร้างโปรไฟล์ที่ถูกจำกัดได้ คุณจะต้องตั้งค่าล็อกหน้าจอเพื่อปกป้องแอปและข้อมูลส่วนตัวของคุณ"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"ตั้งค่าล็อก"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"ไม่ได้ตั้งค่า"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"ไม่ได้ตั้งค่า - โปรไฟล์ที่ถูกจำกัด"</string>
     <string name="user_owner" msgid="3879126011135546571">"เจ้าของ"</string>
+    <string name="user_you" msgid="1639158809315025986">"คุณ (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"ชื่อเล่น"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"เพิ่ม"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"ผู้ใช้มีแอปและเนื้อหาของตัวเอง"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"คุณสามารถจำกัดการเข้าถึงแอปและเนื้อหาจากบัญชีของคุณได้"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"ผู้ใช้"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"โปรไฟล์ที่ถูกจำกัด"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"เพิ่มผู้ใช้ใหม่"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"คุณสามารถใช้อุปกรณ์นี้ร่วมกับคนอื่นๆ ได้ด้วยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนมีพื้นที่ของตัวเอง ซึ่งพวกเขาสามารถกำหนดค่าด้วยแอปพลิเคชัน วอลเปเปอร์ของตนเอง และอื่นๆ นอกจากนี้ ผู้ใช้ยังสามารถปรับการตั้งค่าแท็บเล็ต เช่น WiFi ซึ่งจะส่งผลกระทบต่อทุกคน"\n\n"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า"\n\n"ผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"คุณสามารถใช้อุปกรณ์นี้ร่วมกับคนอื่นๆ ได้ด้วยการสร้างผู้ใช้เพิ่มเติม ผู้ใช้แต่ละคนมีพื้นที่ของตัวเอง ซึ่งพวกเขาสามารถกำหนดค่าด้วยแอปพลิเคชัน วอลเปเปอร์ของตนเอง และอื่นๆ นอกจากนี้ ผู้ใช้ยังสามารถปรับการตั้งค่าแท็บเล็ต เช่น WiFi ซึ่งจะส่งผลกระทบต่อทุกคน"\n\n"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า"\n\n"ผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"หลังจากที่คุณสร้างผู้ใช้ใหม่แล้ว ผู้ใช้รายนั้นๆ ต้องทำตามขั้นตอนในการตั้งค่า"\n\n"ผู้ใช้ทั้งหมดสามารถยอมรับการอนุญาตแอปพลิเคชันที่มีการอัปเดตในนามของผู้ใช้รายอื่นๆ ได้"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"ตั้งค่าผู้ใช้ในขณะนี้หรือไม่"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"ตรวจสอบให้แน่ใจว่าบุคคลดังกล่าวจะสามารถนำแท็บเล็ตไปและตั้งค่าพื้นที่ของตน"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"หากต้องการตั้งค่าโปรไฟล์ทันที"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"ตั้งค่าทันที"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"ข้ามไปก่อน"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"เฉพาะเจ้าของแท็บเล็ตเท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"เฉพาะเจ้าของโทรศัพท์เท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"โปรไฟล์ที่ถูกจำกัดไม่สามารถเพิ่มบัญชีได้"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"ลบ <xliff:g id="USER_NAME">%1$s</xliff:g> จากอุปกรณ์นี้"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"ผู้ใช้ใหม่"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"โปรไฟล์ใหม่"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"ลบตัวคุณเองหรือไม่"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"นำผู้ใช้ออกหรือไม่"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"หากต้องการลบโปรไฟล์"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"พื้นที่และข้อมูลของคุณที่อยู่ในแท็บเล็ตเครื่องนี้จะหายไป คุณไม่สามารถเลิกทำการทำงานนี้"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"พื้นที่และข้อมูลของคุณที่อยู่ในโทรศัพท์เครื่องนี้จะหายไป คุณไม่สามารถเลิกทำการทำงานนี้"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"พื้นที่และข้อมูลของผู้ใช้รายนี้จะหายไปจากแท็บเล็ตเครื่องนี้ คุณไม่สามารถเลิกทำการทำงานนี้"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"พื้นที่และข้อมูลของผู้ใช้รายนี้จะหายไปจากโทรศัพท์เครื่องนี้ คุณไม่สามารถเลิกทำการทำงานนี้"</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"พื้นที่และข้อมูลของโปรไฟล์นี้จะหายไปจากแท็บเล็ตเครื่องนี้ คุณไม่สามารถยกเลิกการทำงานนี้"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"พื้นที่และข้อมูลของโปรไฟล์นี้จะหายไปจากโทรศัพท์เครื่องนี้ คุณไม่สามารถยกเลิกการทำงานนี้"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"กำลังเพิ่มผู้ใช้ใหม่…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ลบผู้ใช้"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"ลบ"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"อนุญาตแอปและเนื้อหา"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"แอปพลิเคชันที่มีข้อจำกัด"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"ขยายการตั้งค่าของแอปพลิเคชัน"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"การตั้งค่านี้ส่งผลต่อผู้ใช้แท็บเล็ตนี้ทุกราย"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"การตั้งค่านี้ส่งผลต่อผู้ใช้โทรศัพท์นี้ทุกราย"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"เปลี่ยนภาษา"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID รูปภาพ"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"การแจ้งเครือข่ายที่ใช้งาน"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"เลือกประเภทของการแจ้งเตือนฉุกเฉินที่จะแสดง"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"ข้อจำกัดแอปพลิเคชันและเนื้อหา"</string>
+    <string name="user_rename" msgid="8523499513614655279">"เปลี่ยนชื่อ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"ตั้งค่าขีดจำกัดแอปพลิเคชัน"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"อนุญาตให้แก้ไขการจับคู่บลูทูธและการตั้งค่า"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะแท็บเล็ตกับอุปกรณ์อื่น"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"อนุญาตให้มีการแลกเปลี่ยนข้อมูลเมื่อแตะโทรศัพท์กับอุปกรณ์อื่น"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"การเข้าถึงตำแหน่ง"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ให้แอปพลิเคชันใช้ข้อมูลตำแหน่งของคุณ"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"ย้อนกลับ"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"ถัดไป"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"เสร็จสิ้น"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"ถ่ายภาพ"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"เลือกรูปภาพจากแกลเลอรี"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 18568fd..bf7da47 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Mabagal"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Mabilis"</item>
-    <item msgid="2538100882620724753">"Napakabilis"</item>
+    <item msgid="1370673569131070146">"Mas Mabilis"</item>
+    <item msgid="4648206845228970803">"Napakabilis"</item>
+    <item msgid="4977949754169483251">"Matulin"</item>
+    <item msgid="6106302964845503577">"Napakatulin"</item>
+    <item msgid="6800277205640837264">"Pinakamabilis"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Napakababa"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Wala"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Wala"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Hindi tinukoy"</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">"Imbakan ng panloob na device"</item>
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
     <item msgid="4498124044785815005">"Hayaang magpasya ang system"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Lokasyon"</item>
+    <item msgid="255608127647030286">"Personal"</item>
+    <item msgid="4588829735729884491">"Pagmemensahe"</item>
+    <item msgid="8971765125227378270">"Device"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"tinatayang lokasyon"</item>
+    <item msgid="5789673140227507995">"eksaktong lokasyon"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"mag-vibrate"</item>
+    <item msgid="3434165993711230924">"magbasa ng mga contact"</item>
+    <item msgid="616161687718081936">"baguhin ang mga contact"</item>
+    <item msgid="7638002295329050091">"basahin ang log ng tawag"</item>
+    <item msgid="6546959730920410907">"baguhin ang log ng tawag"</item>
+    <item msgid="446877710771379667">"magbasa ng kalendaryo"</item>
+    <item msgid="7674458294386319722">"baguhin ang kalendaryo"</item>
+    <item msgid="8281201165558093009">"pag-scan ng wi-fi"</item>
+    <item msgid="8694611243479480497">"notification"</item>
+    <item msgid="7776439107987345446">"pag-scan ng cell"</item>
+    <item msgid="514615766544675057">"tumawag sa telepono"</item>
+    <item msgid="8181415497109310680">"magbasa ng SMS"</item>
+    <item msgid="6816551144382117307">"sumulat ng SMS"</item>
+    <item msgid="4600463921908905030">"tumanggap ng SMS"</item>
+    <item msgid="5958926493289432745">"tumanggap ng pang-emergency na SMS"</item>
+    <item msgid="4945269495221089540">"tumanggap ng MMS"</item>
+    <item msgid="5570472453573929087">"tumanggap ng WAP push"</item>
+    <item msgid="7125408150230860501">"magpadala ng SMS"</item>
+    <item msgid="7080337936612188061">"magbasa ng ICC SMS"</item>
+    <item msgid="587124103118495063">"sumulat ng ICC SMS"</item>
+    <item msgid="2320577158869025503">"baguhin ang mga setting"</item>
+    <item msgid="1545733463471924009">"gumuhit sa tuktok"</item>
+    <item msgid="3609046903962454582">"i-access ang mga notification"</item>
+    <item msgid="4671646036128214513">"camera"</item>
+    <item msgid="1097324338692486211">"i-record ang audio"</item>
+    <item msgid="5031552983987798163">"i-play ang audio"</item>
+    <item msgid="8374996688066472414">"basahin ang clipboard"</item>
+    <item msgid="3045529469061083747">"baguhin ang clipboard"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Lokasyon"</item>
+    <item msgid="8677040780775113033">"Lokasyon"</item>
+    <item msgid="1660743989948992916">"Lokasyon"</item>
+    <item msgid="8791172739860195290">"Mag-vibrate"</item>
+    <item msgid="383413555642128046">"Magbasa ng mga contact"</item>
+    <item msgid="3654594895269697313">"Baguhin ang mga contact"</item>
+    <item msgid="7928393476362362538">"Basahin ang log ng tawag"</item>
+    <item msgid="6248591205254641116">"Baguhin ang log ng tawag"</item>
+    <item msgid="6093344633066170692">"Magbasa ng kalendaryo"</item>
+    <item msgid="1334886368750347692">"Baguhin ang kalendaryo"</item>
+    <item msgid="1638204101698708656">"Lokasyon"</item>
+    <item msgid="2154671955760380322">"Mag-post ng notification"</item>
+    <item msgid="4282477730595931828">"Lokasyon"</item>
+    <item msgid="4891423912898525905">"Tumawag sa telepono"</item>
+    <item msgid="626463821668200388">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Magpadala ng SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Magpadala ng SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Tumanggap ng SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Magpadala ng SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Baguhin ang mga setting"</item>
+    <item msgid="736541391767350377">"Gumuhit sa tuktok"</item>
+    <item msgid="5530815681721654194">"I-access ang mga notification"</item>
+    <item msgid="781213371706962767">"Camera"</item>
+    <item msgid="1720492593061838172">"I-record ang audio"</item>
+    <item msgid="3493046322001257041">"I-play ang audio"</item>
+    <item msgid="136815868796597058">"Basahin ang clipboard"</item>
+    <item msgid="5238692940326972503">"Baguhin ang clipboard"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Maikli"</item>
     <item msgid="2560532955514699713">"Katamtaman"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Graphics)"</item>
     <item msgid="1340692776955662664">"Stack ng tawag sa glGetError"</item>
   </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>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Naka-off"</item>
+    <item msgid="2751513398307949636">"Sa screen bilang mga bar"</item>
+    <item msgid="8272260411216018353">"Sa screen bilang mga linya"</item>
+    <item msgid="120512413928262547">"Sa adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Karaniwang limitasyon"</item>
     <item msgid="4071574792028999443">"Walang mga proseso sa background"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 538a9b5..b7bfd2a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Higit pa..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; mga network"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga network ng mobile, &amp; mga VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga mobile network at mga VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Kumonekta sa mga serbisyo ng data kapag nagro-roam"</string>
@@ -289,7 +289,7 @@
     <string name="zone_auto" msgid="334783869352026648">"Awtomatikong time zone"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Gamitin ang time zone na ibinigay ng network"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Gamitin ang time zone na ibinigay ng network"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Gumamit ng format na 24-oras"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Gamitin ang format na 24-oras"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Magtakda ng oras"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"Pumili ng time zone"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Magtakda ng petsa"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Mag-type ng teksto upang maipakita sa lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Ipakita ang impormasyon ng user sa lock screen"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Impormasyon ng user"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Ipakita ang impormasyon ng profile sa lock screen"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Info ng profile"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Access sa lokasyon"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
     <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>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Pamamahala ng device"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Mga administrator ng device"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Tingnan o alisin sa pagkaka-activate ang mga administrator ng device"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"I-on ang Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Tandaan ang mga setting"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Wireless display"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Upang makakita ng mga device, i-on ang wireless display."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Hindi pinagana ang wireless display dahil naka-off ang Wi-Fi."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Hindi pinagana ang wireless display dahil naka-off ang Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Maghanap ng display"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Naghahanap…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Walang nakita malapit wireless display."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Kapag in-on ang tampok na ito, maaari mong i-beam ang nilalaman ng app sa isa pang device na may kakayahan sa NFC sa pamamagitan ng paghawak sa mga device nang magkalapit. Halimbawa, maaari mong i-beam ang mga pahina sa Browser, video sa YouTube, contact sa People, at higit pa."\n\n"Paglapitin lamang ang mga device (karaniwang magkatalikuran) at pagkatapos ay pindutin ang iyong screen. Tinutukoy ng app kung ano ang nabi-beam."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Pagtuklas sa serbisyo ng network"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Payagan ang apps sa iba pang mga device na tumuklas ng apps sa device na ito"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"I-on ang Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Mga setting ng Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"I-on ang Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Mga setting ng Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Mag-set up &amp; mamahala ng mga wireless na access point"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Piliin ang Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Binubuksan ang Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Ino-off ang Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Pumili ng Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Ino-on ang Wi‑Fi…"</string>
+    <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="3038290727701553612">"I-notify ako kapag available ang bukas na network"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Iwasan ang mahihinang koneksyon"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</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_scan_always_available" msgid="3470564139944368030">"Palaging available ang pag-scan"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Hayaang mag-scan ng mga network ang serbisyo sa lokasyon ng Google at iba pang apps, kahit na naka-off ang Wi-Fi"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Mag-install ng mga certificate"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, maaaring mag-scan ang Google at ang iba pang app kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Maaaring mag-scan ang apps kung may mga network sa malapit, kahit na naka-off ang Wi-Fi. Kung hindi mo ito gustong mangyari, pumunta sa Advanced &gt; Palaging available ang pag-scan."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Huwag ipakitang muli"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Panatilihing naka-on ang Wi-Fi habang naka-sleep"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Nagkaproblema sa pagbabago ng setting"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Pag-optimize sa Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Bawasan ang paggamit ng baterya kapag naka-on ang Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Pag-optimize ng Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Bawasan ang paggamit ng baterya kapag naka-on ang Wi-Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Magdagdag ng network"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Mga Wi-Fi network"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Mga Wi-Fi network"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Push Button ng WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Higit pang mga pagpipilian"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Entry ng Pin ng WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Direkta sa Wi-Fi"</string>
+    <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_connect" msgid="4996220309848349408">"Kumonekta sa network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Upang makita ang mga available na network, i-on ang Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Naghahanap ng mga Wi-Fi network..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para makita ang available network, i-on ang Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Naghahanap ng mga Wi-Fi network..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wala kang pahintulot na baguhin ang Wi‑Fi network."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Iba pang network..."</string>
     <string name="wifi_more" msgid="3195296805089107950">"Higit pa"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Awtomatikong setup (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Upang makumpleto ang pag-setup, kailangan ng iyong tablet ng access sa Wi-Fi. Pagkatapos ng pag-setup, maaari kang magpalipat-lipat sa pagitan ng mobile data at Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Upang makumpleto ang pag-setup, kailangan ng iyong tablet ng access sa Wi-Fi. Pagkatapos ng pag-setup, maaari kang magpalipat-lipat sa pagitan ng data sa mobile at Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Ipakita ang mga advanced na pagpipilian"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Protektadong Setup ng Wi-Fi"</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="7204827509934892103">"Pindutin ang button ng Pinoprotektahang Setup ng Wi-Fi sa iyong router. Maaaring tinatawag itong \"WPS\" o naglalaman ng simbolong ito:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> sa iyong router ng Wi-Fi. Maaaring tumagal nang hanggang dalawang minuto upang makumpleto ang pag-setup."</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_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="5754399645462924103">"Nakakonekta sa Wi-Fi na network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Nakakonekta sa Wi‑Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Umuusad na ang WPS at maaaring tumagal nang hanggang dalawang minuto upang makumpleto"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nabigo ang WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (WEP)"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Pagkabigo sa pagpapatotoo. Pakisubukang muli."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Natunton ang isa pang sesyon ng WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Network SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Ilagay ang SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Seguridad"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Lakas ng signal"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Katayuan"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Payagan ito para sa lahat ng apps na gustong mag-scan?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Tanggihan"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kumonekta"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Nabigong kumonekta sa network."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Kalimutan"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Huwag laktawan"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"BABALA: Maaari kang makaipon ng karagdagang mga singil sa data ng carrier."\n\n"Maaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng tablet."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"BABALA: Maaari kang makaipon ng karagdagang mga singil sa data ng carrier."\n\n"Maaaring mangailangan ng malaking aktibidad ng network ang pag-setup ng telepono."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"BABALA: Hindi mabe-verify ng tablet na napapanahon ang iyong software."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"BABALA: Hindi mabe-verify ng telepono na napapanahon ang iyong software."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Hindi nakakonekta sa Wi-Fi network na ito ang telepono."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Advanced na Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Frequency band ng Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"BABALA: Hangga\'t wala ka pang koneksyon sa internet, hindi mabe-verify ng tablet na napapanahon ang iyong software."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"BABALA: Hangga\'t wala ka pang koneksyon sa internet, hindi mabe-verify ng telepono na napapanahon ang iyong software."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Hindi nakakonekta sa Wi-Fi network na ito ang tablet."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Hindi nakakonekta sa Wi-Fi network na ito ang telepono."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Advanced na Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Frequency band ng Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Tukuyin ang sakop ng frequency ng pagpapatakbo"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Nagkaproblema sa pagtatakda ng frequency band."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC address"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Haba ng prefix ng network"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Impormasyon ng device"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Tandaan ang koneksyong ito"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Maghanap ng mga device"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselahin ang imbitasyon?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Nais mo bang kanselahin ang imbitasyong kumonekta kay <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Kalimutan ang pangkat na ito?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Portable na Wi-Fi hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Pag-on sa hotspot…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Pag-off sa hotspot…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ang Portable na hotspot na <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ay aktibo"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error sa portable na hotspot ng Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"I-set up ang Wi-Fi hotspot"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Error sa portable na Wi-Fi hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"I-set up ang 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="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Lakas ng signal"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Roaming"</string>
     <string name="status_operator" msgid="2274875196954742087">"Network"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Address ng Wi-Fi MAC"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC address ng Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Address ng bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Serial number"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Hindi available"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Pinagana ang APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Hindi pinagana ang APN"</string>
     <string name="bearer" msgid="594270280031923558">"Maydala"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Uri ng MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Halaga ng MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Tanggalin ang APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Bagong APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"I-save"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Tulong"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mga mobile network"</string>
     <string name="location_title" msgid="1029961368397484576">"Aking Lokasyon"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Lok. ng Wi-Fi, mobile network"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Lokasyon ng Wi-Fi, mobile 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="7457348712272184793">"Natukoy ang lokasyon ng Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Natukoy ng Wi-Fi ang lokasyon"</string>
     <string name="location_gps" msgid="8392461023569708478">"Mga GPS Satellite"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Hayaang gamitin ng apps ang GPS sa tablet mo upang matukoy ang iyong lokasyon"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Hayaang gamitin ng apps ang GPS sa telepono mo upang matukoy ang iyong lokasyon"</string>
@@ -967,7 +991,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"Lokasyon &amp; paghahanap sa Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Hayaan ang Google na gamitin ang iyong lokasyon upang mapabuti ang mga resulta ng paghahanap at ang iba pang mga serbisyo"</string>
     <string name="location_access_title" msgid="7064108942964081243">"Access sa aking lokasyon"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"Hayaang gamitin ng apps na humiling ng pahintulot mo ang impormasyon ng iyong lokasyon"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"Hayaan ang apps na humiling ng iyong pahintulot na gamitin ang impormasyon ng iyong lokasyon"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Mga pinagmulan ng lokasyon"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Tungkol sa tablet"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"Tungkol sa telepono"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"I-filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Pumili ng mga opsyon ng filter"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Lahat"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Hindi Pinagana"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Na-download"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Tumatakbo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Imbakan na USB"</string>
@@ -1089,7 +1114,7 @@
     <string name="disabled" msgid="9206776641295849915">"Hindi Pinagana"</string>
     <string name="not_installed" msgid="1475144352069281880">"Hindi naka-install"</string>
     <string name="no_applications" msgid="7336588977497084921">"Walang apps."</string>
-    <string name="internal_storage" msgid="1584700623164275282">"Panloob imbakan"</string>
+    <string name="internal_storage" msgid="1584700623164275282">"Panloob na storage"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Imbakan na USB"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card imbakan"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Muling kino-compute ang laki…"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Kung hindi mo papaganahin ang isang built-in na app, maaaring hindi gumana nang maayos ang iba pang apps. Matatanggal din ang iyong data."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"I-off ang mga notification?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Kung i-o-off mo ang mga notification para sa app na ito, maaari mong makaligtaan ang mahahalagang alerto at update."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Pagpapagana ng app"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Gumagana"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Hindi pa nagamit)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng imbakan"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tingnan ang storage na ginagamit ng apps"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Mga tumatakbong serbisyo"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Salita:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Shortcut:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Wika:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Mag-type ng salita"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Opsyonal na shortcut"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"I-edit ang salita"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"I-edit"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Tanggalin"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Mga setting ng pisikal na keyboard"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Mga pagpipilian ng nag-develop"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Magtakda ng mga pagpipilian para sa pagbuo ng app"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Hindi available ang mga pagpipilian ng developer para sa user na ito"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Debugging ng USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode kapag nakakonekta ang USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Bawiin ang mga pahintulot sa pag-debug ng USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Mga ulat sa bug sa menu ng power"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Isama ang pagpipilian sa menu ng power para sa pagkuha ng ulat sa bug"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Manatiling gumagana"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Payagan ang mga setting ng pag-develop?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Nilalayon ang mga setting na ito para sa paggamit sa pag-develop lamang. Maaaring magsanhi ang mga ito ng pagkasira o hindi paggana nang maayos ng iyong device at mga application na nandito."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"I-verify ang apps sa USB"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"I-auto update pag-magnify ng screen"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"I-update pag-magnify ng screen sa app transition"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tinatapos ng power button ang tawag"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Tntpos ng pwer buttn ang twag"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Sabihin ang mga password"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Pindutin nang matagal ang pagkaantala"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Pahusayin ang accessibility sa web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Mga Setting"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Naka-on"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Naka-off"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Pinapayagan"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Hindi pinapayagan"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Payagan"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Huwag payagan"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Gamitin ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"Maaaring kolektahin ng <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ang lahat ng tekstong iyong tina-type, maliban sa mga password. Kabilang dito ang personal na data tulad ng mga credit card number. Maaari rin itong mangolekta ng data tungkol sa iyong mga pakikipag-ugnayan gamit ang tablet."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"Maaaring kolektahin ng <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ang lahat ng tekstong iyong tina-type, maliban sa mga password. Kabilang dito ang personal na data gaya ng mga credit card number. Maaari rin itong mangolekta ng data tungkol sa iyong mga pakikipag-ugnayan gamit ang telepono."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Ihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Ang pagpindot sa OK ay magpapahinto sa <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Obserbahan ang iyong mga pagkilos"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Makatanggap ng mga notification kapag nakikipag-ugnayan ka sa isang app."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Ihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Kapag pinindot ang OK, hihinto ang <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Walang mga serbisyong naka-install"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Kailangan ng screen reader?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Nagbibigay ang TalkBack ng pasalitang feedback upang matulungan ang mga user na bulag at may mahinang paningin. Nais mo ba itong i-install nang libre mula sa Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Nais mo bang mag-install ang apps ng mga script mula sa Google na ginagawang mas naa-access ang nilalaman sa web ng mga ito?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Walang ibinigay na paglalarawan."</string>
     <string name="settings_button" msgid="3006713718908152930">"Mga Setting"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Baterya"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Nagcha-charge"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Naka-on ang screen"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"Naka-on ang GPS"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Bukas"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal ng mobile network"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Device ng oras ng paggising"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi sa oras"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi sa oras"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na nasa oras"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na nasa oras"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Mga detalye ng kasaysayan"</string>
     <string name="details_title" msgid="3792801565213935385">"Gamitin ang mga detalye"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Isaayos ang paggamit ng power"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Mga kasamang package"</string>
     <string name="power_screen" msgid="3023346080675904613">"Screen"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Standby ng cell"</string>
     <string name="power_phone" msgid="5392641106474567277">"Mga boses ng tawag"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU foreground"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Panatilihing bukas"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Tumatakbo ang Wi-Fi"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Tumatakbo ang Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telepono"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Ipinadala ang data"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Impormasyon ng app"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mga setting ng app"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Mga setting ng screen"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Mga setting ng Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Mga setting ng Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Mga setting ng bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Bateryang ginagamit ng mga tawag ng boses"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Bateryang ginamit kapag idle ang tablet"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Lumipat sa airplane mode upang mag-save ng power sa mga lugar na walang saklaw ng cell"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Bateryang ginamit ng display at backlight"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Pababain ang linaw ng screen at/o screen timeout"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Bateryang ginamit ng Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"I-off ang Wi-Fi kapag hindi ito ginagamit o kapag hindi ito available"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Bateryang ginamit ng Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"I-off ang Wi-Fi kapag hindi ito ginagamit o kapag hindi ito available"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bateryang ginamit ng Bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"I-off ang Bluetooth kapag hindi mo ito ginagamit"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Subukang kumonekta sa ibang Bluetooth device"</string>
@@ -1423,7 +1451,7 @@
     <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_rate_title" msgid="6030550998379310088">"Rate ng pagsasalita"</string>
-    <string name="tts_default_rate_summary" msgid="4061815292287182801">"Bilis kung saan sinasabit ang teksto"</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>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Naaapektuhan ang tono ng tekstong sinasabi"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Wika"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"I-configure"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Pumili ng isa pang engine"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Maaaring makolekta ng speech synthesis engine na ito ang lahat ng teksto na sasabihin, kabilang ang personal na data tulad ng mga password at mga numero ng credit card. Nanggagaling ito mula sa <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> engine. Paganahin ang paggamit ng speech synthesis engine na ito?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Nangangailangan ang wikang ito ng gumaganang koneksyon sa network para sa text-to-speech na output."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Mga Engine"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> (na) setting"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"Pinagana ang <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Ginustong engine"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Pangkalahatan"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kontrol ng power"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ina-update ang setting ng Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ina-update ang setting ng Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Pag-update ng setting ng Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"naka-on"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"naka-off"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"pag-on"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"pag-off"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"I-sync"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA certificate"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Uri ng storage"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Software lang"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"I-backup &amp; ipanumbalik"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Personal na data"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"I-back up ang aking data"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Mag-back up ng data ng app, mga password ng Wi-Fi, at ibang setting sa mga server ng Google"</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="auto_restore_title" msgid="5397528966329126506">"Awtomatikong pagbalik"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Hindi tugma ang password at kumpirmasyon"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Pagkabigo sa pagtatakda ng backup na password"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Huminto sa pag-back up ng iyong mga password sa Wi-Fi, bookmark, ibang setting, at data ng app, at burahin ang lahat ng kopya sa mga server ng Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Ihinto ang pag-back up ng iyong mga password ng Wi-Fi, bookmark, iba pang mga setting at data ng app, at burahin ang lahat ng kopya sa mga server ng Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Mga setting ng administration ng device"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Administrator ng device"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"I-deactivate"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Mga Notification"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ringtone at pag-vibrate ng tawag"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"System"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Pag-set up ng Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Kumonekta sa Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Kumokonekta sa Wi-Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Konektado sa Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Pag-setup ng Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Kumonekta sa Wi-Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Kumokonekta sa Wi-Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Nakakonekta sa Wi‑Fi network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Magdagdag ng network"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Hindi nakakonekta"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Magdagdag ng network"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Kumokonekta…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Pumunta sa susunod na hakbang"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"Hindi sinusuportahan ang EAP."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Hindi ka makakapag-configure ng koneksyong EAP Wi-Fi sa panahon ng setup. Pagkatapos ng pag-setup, maaari mo iyong gawin sa Mga Setting &gt; Wireless &amp; mga network."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Hindi ka makakapag-configure ng koneksyong EAP Wi-Fi sa panahon ng pag-setup. Pagkatapos ng pag-setup, magagawa mo iyon sa Mga Setting &gt; Wireless at mga network."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Maaaring tumagal nang ilang minuto ang pagkonekta…"</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa setup."\n\n"Pindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang network ng Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa pag-setup."\n\n"Pindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang Wi-Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Pinapagana ang sync"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Hindi pinapagana ang pag-sync"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error sa pag-sync."</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Hinihintay ng na-debug na application na ma-attach ang debugger bago magsagawa"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Input"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Pagguhit"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Pag-render na pinapabilis ng hardware"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Pagsubaybay"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Pinagana ang istriktong mode"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"I-flash screen pag gawa app ng haba takbo sa una thread"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Maganda-di maganda: asul, berde, light red, pula"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Paganahin ang mga trace"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Piliin pinapaganang trace"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Walang mga trace na kasalukuyang pinapagana"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> (na) trace ang kasalukuyang pinapagana"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Kasalukuyang pinapagana ang lahat ng trace"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Paganahin trace ng OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Ipakita mga layout bound"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Ipakita ang mga hangganan ng clip, margin, atbp."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Sapilitang paggamit sa GPU para sa 2d na pagguhit"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Puwersahin ang 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Paganahin ang 4x MSAA sa OpenGL ES 2.0 na apps"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"I-debug ang pagpapatakbo ng di-parihabang pag-clip"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Pag-render GPU ng Profile"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Sukat oras pag-render sa adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Scale ng animation window"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Limitasyon ng proseso sa background"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Ipakita ang lahat ng ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Ipakita dialog Di Tumugon App para background apps"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Use Experimental WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Gagamitin ng apps ang pinakabagong (beta) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Paggamit ng data"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cycle sa paggamit ng data"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roaming ng data"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Paghigpitan ang data ng background"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Hiwalay na paggamit ng 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Ipakita ang paggamit ng Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Ipakita ang Wi-Fi usage"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ipakita ang paggamit ng Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mga mobile hotspot"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"I-auto-sync ang data"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Itakda ang limitasyon ng data ng mobile"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Itakda ang limitasyon ng 4G data"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Itakda ang limitasyon ng 2G-3G data"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Itakda ang limitasyon ng Wi-Fi data"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"I-set ang Wi-Fi data limit"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobile"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong tablet ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Hindi pagaganahin ang koneksyon ng iyong data ng mobile kapag naabot na ang tinukoy na limitasyon."\n\n"Dahil sinusukat ng iyong telepono ang paggamit ng data, at maaaring kuwentahin ang iyong carrier para sa paggamit sa ibang paraan, isaalang-alang ang paggamit ng konserbatibong limitasyon."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Paghigpitan ang data ng background?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang app at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Kung pagihihgpitan mo ang background na mobile data, hindi gagana ang ilang apps at serbisyo hanggang sa makakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Kung paghihigpitan mo ang background na mobile data, hindi gagana ang ilang apps at serbisyo hanggang sa makakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Kung paghihigpitan mo ang background na data sa mobile, hindi gagana ang ilang apps at serbisyo maliban kung nakakonekta ka sa isang Wi-Fi network."\n\n"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"babala"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limitasyon"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Mga inalis na app"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tablet mo. Maaaring iba kwenta sa gamit ng data ng carrier."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> gamit, sinukat ng tel mo. Maaaring iba kwenta sa paggamit ng data ng carrier."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mga mobile hotspot"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Piliin ang mga network ng Wi-Fi na mga mobile hotspot. Maaaring paghigpitan ang apps mula sa paggamit sa mga network na ito kapag nasa background. Maaari ring magbabala ang apps bago gamitin ang mga network na ito para sa malalaking pag-download."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Piliin ang mga Wi-Fi network na nagsisilbing mga mobile hotspot. Maaaring paghigpitan ang apps sa paggamit ng mga network na ito kapag nasa background. Maaari ding magbabala ang apps bago gamitin ang mga network na ito para sa malalaking pag-download."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mga mobile network"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mga Wi-Fi network"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Upang pumili ng mga mobile hotspot, i-on ang Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Mga Wi-Fi network"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Upang pumili ng mga mobile hotspot, i-on ang Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Emergency na tawag"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Balikan ang tawag"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Pangalan"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Nagpapahintulot"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Nagpapatupad"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Mga User"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Ikaw"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Iba pang mga user"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Idagdag ang user"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Aktibo"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Hindi aktibo"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Mga user at profile"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Magdagdag ng user o profile"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Pinaghihigpitang profile"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Bago ka makakalikha ng pinaghihigpitang profile, kakailanganin mong mag-set up ng lock ng screen upang protektahan ang iyong apps at personal na data."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Itakda ang lock"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Hindi naka-set up"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Hindi naka-set up - Pinaghihigpitang profile"</string>
     <string name="user_owner" msgid="3879126011135546571">"May-ari"</string>
+    <string name="user_you" msgid="1639158809315025986">"Ikaw (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Palayaw"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Idagdag"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"May sariling apps at nilalaman ang mga user"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Maaari mong paghipitan ang access sa apps at nilalaman mula sa iyong account"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"User"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Pinaghihigpitang profile"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Idagdag ang bagong user"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Maibabahagi mo ang device na ito sa iba pang mga tao sa pamamagitan ng paglikha ng mga karagdagang user. May sariling espasyo ang bawat user, na maaari nilang i-customize gamit ang kanilang sariling apps, wallpaper, at marami pa. Maaari ring ayusin ng mga user ang mga setting ng tablet tulad ng Wi-Fi na makakaapekto sa lahat."\n\n"Pagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup."\n\n"Ang sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Maibabahagi mo ang device na ito sa iba pang mga tao sa pamamagitan ng paglikha ng mga karagdagang user. May sariling espasyo ang bawat user, na mako-customize nila gamit ang kanilang sariling apps, wallpaper, at higit pa. Maisasaayos din ng mga user ang mga setting ng tablet tulad ng Wi-Fi na makakaapekto sa lahat."\n\n"Pagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup."\n\n"Ang sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Pagkatapos mong lumikha ng bagong user, kailangang sumailalim ng taong iyon sa proseso ng pag-setup."\n\n"Ang sinumang user ay maaaring tumanggap ng na-update na mga pagpapahintulot sa app sa ngalan ng lahat ng iba pang user."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"I-set up ang user ngayon?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Tiyaking available ang tao na kunin ang tablet at i-set up ang kanyang espasyo"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Mag-set up ng profile ngayon?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"I-set up ngayon"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Huwag ngayon"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Ang may-ari lang ng tablet ang maaaring mamahala ng mga user."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Ang may-ari lang ng telepono ang maaaring mamahala ng mga user."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Hindi makakapagdagdag ng mga account sa mga pinaghihigpitang profile"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Tanggal <xliff:g id="USER_NAME">%1$s</xliff:g> dito device"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Bagong user"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Bagong profile"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Tanggalin ang iyong sarili?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Alisin ang user?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Alisin ang profile?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Mawawala mo ang iyong espasyo at data sa tablet na ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Mawawala mo ang iyong espasyo at data sa teleponong ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Mawawala ang espasyo at data ng user na ito sa tablet na ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Mawawala ang espasyo at data ng user na ito sa teleponong ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Mawawala ang espasyo at data ng profile na ito sa tablet na ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Mawawala ang espasyo at data ng profile na ito sa teleponong ito. Hindi mo maaaring i-undo ang pagkilos na ito."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Nagdaragdag ng bagong user…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Tanggalin ang user"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Tanggalin"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Nakakaapekto ang setting na ito sa lahat ng user sa tablet na ito."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Nakakaapekto ang setting na ito sa lahat ng user sa teleponong ito."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Baguhin ang wika"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Mga cell broadcast"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Piliin ang mga uri ng mga alerto sa emergency na ipapakita."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Mga paghihigpit sa app at nilalaman"</string>
+    <string name="user_rename" msgid="8523499513614655279">"I-RENAME"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Magtakda ng limit ng application"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Payagan ang pagbago sa mga pagpapares at setting ng Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Payagan ang pagpapalitan ng data kapag dumikit ang tablet sa isa pang device"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Payagan ang pagpapalitan ng data kapag dumikit ang telepono sa isa pang device"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Access sa lokasyon"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Hayaan ang apps na gamitin ang impormasyon ng iyong lokasyon"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Bumalik"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Susunod"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Tapusin"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Kumuha ng larawan"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Pumili ng larawan mula sa Gallery"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index c76985c..31b15f0 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Yavaş"</item>
     <item msgid="1145554631248513562">"Normal"</item>
     <item msgid="7553665153391107454">"Hızlı"</item>
-    <item msgid="2538100882620724753">"Çok hızlı"</item>
+    <item msgid="1370673569131070146">"Daha hızlı"</item>
+    <item msgid="4648206845228970803">"Çok hızlı"</item>
+    <item msgid="4977949754169483251">"Seri"</item>
+    <item msgid="6106302964845503577">"Çok seri"</item>
+    <item msgid="6800277205640837264">"En hızlı"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Çok düşük"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Yok"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Yok"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Belirtilmedi"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Yok"</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">"Dahili cihaz depolaması"</item>
     <item msgid="3738430123799803530">"Çıkarılabilir SD kart"</item>
     <item msgid="4498124044785815005">"Sistem karar versin"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Konum"</item>
+    <item msgid="255608127647030286">"Kişisel"</item>
+    <item msgid="4588829735729884491">"Mesajlaşma"</item>
+    <item msgid="8971765125227378270">"Cihaz"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"yaklaşık konum"</item>
+    <item msgid="5789673140227507995">"hassas konum"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"titreşim"</item>
+    <item msgid="3434165993711230924">"kişileri oku"</item>
+    <item msgid="616161687718081936">"kişileri değiştir"</item>
+    <item msgid="7638002295329050091">"çağrı günlüğünü oku"</item>
+    <item msgid="6546959730920410907">"çağrı günlüğünü değiştir"</item>
+    <item msgid="446877710771379667">"takvimi oku"</item>
+    <item msgid="7674458294386319722">"takvimi değiştir"</item>
+    <item msgid="8281201165558093009">"kablosuz tarama"</item>
+    <item msgid="8694611243479480497">"bildirim"</item>
+    <item msgid="7776439107987345446">"hücre tarama"</item>
+    <item msgid="514615766544675057">"telefon et"</item>
+    <item msgid="8181415497109310680">"SMS oku"</item>
+    <item msgid="6816551144382117307">"SMS yaz"</item>
+    <item msgid="4600463921908905030">"SMS al"</item>
+    <item msgid="5958926493289432745">"acil SMS al"</item>
+    <item msgid="4945269495221089540">"MMS al"</item>
+    <item msgid="5570472453573929087">"WAP push al"</item>
+    <item msgid="7125408150230860501">"SMS gönder"</item>
+    <item msgid="7080337936612188061">"ICC SMS oku"</item>
+    <item msgid="587124103118495063">"ICC SMS yaz"</item>
+    <item msgid="2320577158869025503">"ayarları değiştir"</item>
+    <item msgid="1545733463471924009">"üste çiz"</item>
+    <item msgid="3609046903962454582">"bildirimlere eriş"</item>
+    <item msgid="4671646036128214513">"kamera"</item>
+    <item msgid="1097324338692486211">"ses kaydet"</item>
+    <item msgid="5031552983987798163">"sesi çal"</item>
+    <item msgid="8374996688066472414">"panoyu oku"</item>
+    <item msgid="3045529469061083747">"panoyu değiştir"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Konum"</item>
+    <item msgid="8677040780775113033">"Konum"</item>
+    <item msgid="1660743989948992916">"Konum"</item>
+    <item msgid="8791172739860195290">"Titreşim"</item>
+    <item msgid="383413555642128046">"Kişileri oku"</item>
+    <item msgid="3654594895269697313">"Kişileri değiştir"</item>
+    <item msgid="7928393476362362538">"Çağrı günlüğünü oku"</item>
+    <item msgid="6248591205254641116">"Çağrı günlüğünü değiştir"</item>
+    <item msgid="6093344633066170692">"Takvimi oku"</item>
+    <item msgid="1334886368750347692">"Takvimi değiştir"</item>
+    <item msgid="1638204101698708656">"Konum"</item>
+    <item msgid="2154671955760380322">"Bildirim yayınla"</item>
+    <item msgid="4282477730595931828">"Konum"</item>
+    <item msgid="4891423912898525905">"Telefon et"</item>
+    <item msgid="626463821668200388">"SMS/MMS al"</item>
+    <item msgid="1237538540368797101">"SMS/MMS gönder"</item>
+    <item msgid="3986142739951490025">"SMS/MMS al"</item>
+    <item msgid="3984213795861739778">"SMS/MMS al"</item>
+    <item msgid="3656243523752472788">"SMS/MMS al"</item>
+    <item msgid="8105802370238551510">"SMS/MMS al"</item>
+    <item msgid="1407766984645388488">"SMS/MMS gönder"</item>
+    <item msgid="1530132603376027248">"SMS/MMS al"</item>
+    <item msgid="1188256962149204607">"SMS/MMS gönder"</item>
+    <item msgid="4218544235221631789">"Ayarları değiştir"</item>
+    <item msgid="736541391767350377">"Üste çiz"</item>
+    <item msgid="5530815681721654194">"Bildirimlere eriş"</item>
+    <item msgid="781213371706962767">"Kamera"</item>
+    <item msgid="1720492593061838172">"Ses kaydet"</item>
+    <item msgid="3493046322001257041">"Sesi çal"</item>
+    <item msgid="136815868796597058">"Panoyu oku"</item>
+    <item msgid="5238692940326972503">"Panoyu değiştir"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kısa"</item>
     <item msgid="2560532955514699713">"Orta"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Grafik)"</item>
     <item msgid="1340692776955662664">"glGetError\'da yığın çağır"</item>
   </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="1064373276095698656">"Test edilmiş çizim komutlarını yeşille vurgula"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Kapalı"</item>
+    <item msgid="2751513398307949636">"Ekranda çubuk şeklinde"</item>
+    <item msgid="8272260411216018353">"Ekranda çizgi şeklinde"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo içinde"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Standart sınır"</item>
     <item msgid="4071574792028999443">"Arka planda işlem yok"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3c03a19..a820b05 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Uçak modu"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Diğer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Kablosuz özelliği ve ağlar"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Kablosuz, Bluetooth, uçak modu, mobil ağ ve VPN özelliklerini yönet"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Kablosuz, Bluetooth, uçak modu, mobil ağlar ve VPN\'leri yönet"</string>
     <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Dolaşırken veri hizmetlerine bağlan"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Dolaşırken veri hizmetlerine bağlan"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kilit ekranında görüntülenecek metni yazın"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kilit ekranında kullanıcı bilgilerini göster"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Kullanıcı bilgileri"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kilit ekranında profil bilgisini göster"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Profil bilgisi"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Konum erişimi"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Güvenlik"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
@@ -418,20 +420,29 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Cihaz yönetimi"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Cihaz yöneticileri"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Cihaz yöneticilerini görüntüle veya devre dışı bırak"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth\'u aç"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Bağlantıları yönet, cihaz adını gir ve keşfedilebilirlik ayarını yap"</string>
     <string name="bluetooth_pairing_request" msgid="6385750334766370310">"Bluetooth eşleşme isteği"</string>
-    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihazın istenen PIN\'ini yazın:"</string>
-    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşleştirmek için cihazın istenen passkey kodunu yazın:"</string>
+    <string name="bluetooth_enter_pin_msg" msgid="5698297871117529185">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşlemek için cihazın istenen PIN\'ini yazın:"</string>
+    <string name="bluetooth_enter_passkey_msg" msgid="2220143735340367939">"<xliff:g id="BOLD_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> ile eşlemek için cihazın istenen passkey kodunu yazın:"</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN, harfler veya simgeler içerir"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Genellikle 0000 veya 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"Bu PIN\'i diğer cihazda da yazmanız gerekebilir."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"Bu passkey kodunu diğer cihazda da girmeniz gerekebilir."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Şu cihazla eşleştirmek için:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Şu passkey kodunun göründüğünden emin olun:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_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şleştirilsin mi?"</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_decline" msgid="4185420413578948140">"İptal"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Ayarları anımsa"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Kablosuz ekran"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Cihazları görmek için kablosuz ekranı açın."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Kablosuz bağlantı kapalı olduğundan kablosuz ekran devre dışı."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Kablosuz bağlantı kapalı olduğundan kablosuz ekran devre dışı."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Ekran ara"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Aranıyor…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Yakında kablosuz ekran bulunamadı."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Bu özellik açık olduğunda, cihazları birbirine yakın tutarak uygulama içeriğini NFC özelliği olan başka bir cihaza ışınlayabilirsiniz. Örneğin, Tarayıcı sayfalarını, YouTube videolarını, Kayıtlı kişilerinizi ve diğer verileri ışınlayabilirsiniz."\n\n"Cihazları bir araya getirmeniz (genellikle sırt sırta) ve ekranınıza dokunmanız yeterli. Uygulama nelerin ışınlanacağını belirler."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ağ hizmeti keşfi"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Diğer cihazlardaki uygulamaların bu cihazdaki uygulamaları keşfetmesine izin ver"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Kablosuz"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Kablosuzu aç"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Kablosuz"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Kablosuz ayarları"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Kablosuz"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Kablosuz"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Kablosuz\'u aç"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Kablosuz"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Kablosuz ayarları"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Kablosuz"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Kablosuz erişim noktalarını kur ve yönet"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Kablosuz seç"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Kablosuz açılıyor..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Kablosuz kapatılıyor…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Kablosuz seç"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Kablosuz açılıyor…"</string>
+    <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="3038290727701553612">"Açık bir ağ kullanılabilir olduğunda bana bildir"</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="2466956369738047669">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Uykudayken Kablosuz bağlantıyı açık tut"</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_scan_always_available" msgid="3470564139944368030">"Tarama her zaman kullanılabilir"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Kablosuz özelliği kapalıyken dahi Google\'ın konum hizmetinin ve diğer uygulamaların ağları taramasına izin ver"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Sertifika yükle"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Konum doğruluğunu iyileştirmek için ve diğer amaçlarla, Google ve diğer uygulamalar, Kablosuz kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Uygulamalar, Kablosuz bağlantı kapalı olduğunda dahi yakınlardaki ağları tarayabilir. Bunu istemiyorsanız, Gelişmiş &gt; Tarama her zaman kullanılabilir seçeneğine gidin."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Bir daha gösterme"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Uykudayken Kablosuz\'u açık tut"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Ayarı değiştirirken bir sorun oluştu"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Kablosuz optimizasyonu"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Kablosuz açıkken pil kullanımını en aza indir"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Kablosuz optimizasyonu"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Kablosuz açıkken pil kullanımını en aza indir"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Ağ ekle"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Kablosuz ağlar"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Kablosuz ağlar"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Düğmesi"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Diğer seçenekler"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin Girişi"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Kablosuz Doğrudan Bağlantı"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Kablosuz Doğrudan"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Tara"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Gelişmiş"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Kullanılabilir ağları görmek için, Kablosuz\'u açın."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Kablosuz ağlar aranıyor…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kullanılabilir ağları görmek için Kablosuz\'u açın."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Kablosuz ağlar aranıyor…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Kablosuz ağı değiştirme izniniz yok."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Diğer ağ…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Diğer"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Otomatik kurulum (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Kurulumun tamamlanabilmesi için tabletinizin Kablosuz bağlantıya erişmesi gerekecektir. Kurulumdan sonra, mobil veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Kurulumun tamamlanabilmesi için tabletinizin Kablosuz\'a erişmesi gerekmektedir. Kurulumdan sonra, mobil veri ile Kablosuz arasında geçiş yapabilirsiniz."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Gelişmiş seçenekleri göster"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kablosuz Korumalı Kurulum"</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="7204827509934892103">"Yönlendiricinizdeki Kablosuz Korumalı Kurulum düğmesine basın. \"WPS\" yazıyor olabilir veya bu simgeyi taşıyabilir:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS zaten devam ediyor ve tamamlanması iki dakika alabilir"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS başarısız oldu. Lütfen birkaç dakika içinde tekrar deneyin."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Kablosuz yönlendirici güvenlik ayarı (WEP) desteklenmiyor"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Kimlik doğrulama başarısız oldu. Lütfen tekrar deneyin."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Başka bir WPS oturumu saptandı. Lütfen birkaç dakika sonra tekrar deneyin."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"Ağ SSID\'si"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"SSID\'yi girin"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Güvenlik"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Sinyal gücü"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Durum"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</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\n"Tarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Reddet"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Bağlan"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Ağa bağlanılamadı"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Unut"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Atlama"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"UYARI: Ek operatör veri ücretleri alınabilir."\n\n"Tabletin kurulumu önemli miktarda ağ etkinliği gerektirebilir."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"UYARI: Ek operatör veri ücretleri alınabilir."\n\n"Telefonun kurulumu önemli miktarda ağ etkinliği gerektirebilir."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"UYARI: Tablet, yazılımınızın güncel olduğunu doğrulayamayacaktır."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"UYARI: Telefon, yazılımınızın güncel olduğunu doğrulayamayacaktır."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Tablet bu Kablosuz ağa bağlanamadı."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Telefon bu Kablosuz ağa bağlanamadı."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Gelişmiş Kablosuz"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Kablosuz frekans bandı"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"UYARI: İnternet bağlantınız olmadan tabletiniz yazılımlarınızın güncel olup olmadığını doğrulayamaz."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"UYARI: İnternet bağlantınız olmadan telefonunuz yazılımlarınızın güncel olup olmadığını doğrulayamaz."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Tablet bu Kablosuz ağa bağlanamadı."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Telefon bu Kablosuz ağa bağlanamadı."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Gelişmiş Kablosuz"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Kablosuz frekans bandı"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"İşlemin sıklık aralığını belirtin"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Frekans bandı ayarlanırken bir sorun oldu."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC adresi"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Geçit"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ağ önek uzunluğu"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Kablosuz Doğrudan Bağlantı"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Kablosuz Doğrudan"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Cihaz bilgileri"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Bu bağlantıyı hatırla"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Cihaz ara"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Davetiye iptal edilsin mi?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> cihazına bağlanma davetiyesini iptal etmek istiyor musunuz?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bu grup unutulsun mu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Taşınabilir Kablosuz hotspot"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot açılıyor…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kapatılıyor…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir ortak erişim noktası <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Taşınabilir kablosuz ortak erişim noktası hatası"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Kablosuz hotspot kurulumu yap"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> taşınabilir kablosuz ortak erişim noktası"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Taşınabilir Kablosuz hotspot"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Kablosuz hotspot kurulumu yap"</string>
+    <string name="wifi_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="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Sinyal gücü"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Dolaşım"</string>
     <string name="status_operator" msgid="2274875196954742087">"Ağ"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Kablosuz MAC adresi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Kablosuz MAC adresi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Bluetooth adresi"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Seri numara"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Kullanılamıyor"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN etkin"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN devre dışı"</string>
     <string name="bearer" msgid="594270280031923558">"Taşıyıcı"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO türü"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO değeri"</string>
     <string name="menu_delete" msgid="6981294422841124659">"APN\'yi sil"</string>
     <string name="menu_new" msgid="3014205883303921729">"Yeni APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Kaydet"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Yardım"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mobil ağlar"</string>
     <string name="location_title" msgid="1029961368397484576">"Konumum"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Kablosuz ve mobil ağ konumu"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Kablosuz ve mobil 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="7457348712272184793">"Konum, Kablosuz tarafından belirlendi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Konum, Kablosuz tarafından belirlendi"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS uyduları"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Uygulamalar konumunuzu tam olarak belirlemek üzere tabletinizin GPS\'sini kullanabilsin"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Uygulamalar konumunuzu tam olarak belirlemek üzere telefonunuzun GPS\'sini kullanabilsin"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtre seçeneklerini belirleyin"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tümü"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Devre dışı"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"İndirilenler"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışanlar"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB bellek"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Yerleşik uygulamayı devre dışı bırakırsanız, diğer uygulamaların işleyişinde sorun olabilir. Ayrıca verileriniz de silinecektir."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Bildirimler kapatılsın mı?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Bu uygulama için bildirimleri kapatırsanız, önemli uyarıları ve güncellemeleri kaçırabilirsiniz."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Uygulama çalışma ayarları"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Çalışıyor"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Hiç kullanılmadı)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Depolama kullanımı"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Uygulamalar tarafından kullanılan depolama alanını görüntüle"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
@@ -1192,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Fiziksel klavye ayarları"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"“.” karakterini girmek için Boşluk tuşuna iki kez basın"</string>
     <string name="show_password" msgid="3001113966880559611">"Şifreleri görünür yap"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Bu giriş yöntemi, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. Yöntem, <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu giriş yöntemini kullanmak istiyor musunuz?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Bu giriş yöntemi, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. Bu yöntem, <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g> uygulamasının bir özelliğidir. Bu giriş yöntemini kullanmak istiyor musunuz?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Bu yazım denetleyici, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil olmak üzere yazdığınız tüm metni toplayabilir. Yazım denetleyici, <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g> uygulamasından gelmektedir. Bu yazım denetleyiciyi kullanmak istiyor musunuz?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Ayarlar"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Dil"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Kelime:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Kısayol:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Dil:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Bir kelime yazın"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"İsteğe bağlı kısayol"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Kelimeyi düzenle"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Düzenle"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Sil"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Fiziksel klavye ayarları"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Geliştirici seçenekleri"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Uygulama geliştirme için seçenekleri ayarla"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Bu kullanıcı, geliştirici seçeneklerini kullanamaz"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB hata ayıklaması"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB bağlandığında hata ayıklama modu"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"USB hata ayıklama yetkilendirmelerini iptal et"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Güç menüsü hata raporları"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Güç menüsünde hata raporunu alma seçeneğini dahil et"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Uyanık kal"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Geliştirme amaçlı ayarlara izin verilsin mi?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Bu ayarlar yalnızca geliştirme amaçlıdır. Cihazınızın veya cihazdaki uygulamaların bozulmasına veya hatalı çalışmasına neden olabilir."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"USB\'den yüklenen uygulamaları doğrula"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Güç düğmesi çağrıyı sonlandırır"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Şifreleri sesli olarak oku"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Dokunma ve basılı tutma süresi"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Web erişilebilirliğini geliştir"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ayarlar"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Açık"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kapalı"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"İzin Verildi"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"İzin verilmiyor"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"İzin ver"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"İzin verme"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"<xliff:g id="SERVICE">%1$s</xliff:g> kullanılsın mı?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>, şifreler dışında yazdığınız tüm metinleri toplayabilir. Buna kredi kartı numaraları gibi kişisel veriler de dahildir. Ayrıca, tablet ile etkileşimleriniz hakkında da bilgi toplayabilir."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> şifreler dışında yazdığınız tüm metinleri toplayabilir. Buna kredi kartı numaraları gibi kişisel veriler de dahildir. Ayrıca, telefon ile etkileşimleriniz hakkında da bilgi toplayabilir."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Tamam\'a dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> durdurulur."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"İşlemlerinizi izleyin"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Bir uygulamayla etkileşim kurduğunuzda bildirim alın."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Tamam\'a dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> durdurulur."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hiçbir hizmet yüklenmedi"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Ekran okuyucusuna ihtiyacınız var mı?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack, görme engelli veya az gören kullanıcılara yardımcı olmak için sesli geri bildirim sağlar. Bu uygulamayı Android Market\'ten ücretsiz olarak yüklemek ister misiniz?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Uygulamaların Google\'dan web içeriklerini daha erişilebilir hale getirecek komut dosyaları yüklemesini istiyor musunuz?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
     <string name="settings_button" msgid="3006713718908152930">"Ayarlar"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pil"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Şarj oluyor"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Ekran açık"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS açık"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Kablosuz"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Kablosuz"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Uyanık"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobil ağ sinyali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Zamnnd kablsz"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Zamnnd kablsz"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Zamanında Kablosuz"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Zamanında Kablosuz"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Geçmiş ayrıntıları"</string>
     <string name="details_title" msgid="3792801565213935385">"Ayrıntıları kullan"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Pil kullanımını ayarla"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Dahil olan paketler"</string>
     <string name="power_screen" msgid="3023346080675904613">"Ekran"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Kablosuz"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Kablosuz"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Telefon beklemesi"</string>
     <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ön planı"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Uyanık tut"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Kablosuz çalışıyor"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Kablosuz çalışıyor"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Tablet"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Telefon"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Gönderilen veriler"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Uygulama bilgileri"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Uygulama ayarları"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ekran ayarları"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Kablosuz ayarları"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Kablosuz ayarları"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth ayarları"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Sesli aramalar tarafından kullanılan pil"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Tablet boştayken kullanılan pil"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Cep telefonunun kapsama alanı dışında olduğu yerlerde pilden tasarruf etmek için uçak moduna geçin"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Ekran ve arka aydınlatma ışığı tarafından kullanılan pil"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Ekran parlaklığını ve/veya ekranın zaman aşımını azaltın"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Kablosuz özellik tarafından kullanılan pil"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Kullanmadığınızda veya kullanılabilir olmadığında Kablosuz özelliğini kapatın"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Kablosuz tarafından kullanılan pil"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Kullanmadığınızda veya kullanılabilir olmadığında Kablosuz özelliğini kapatın"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Bluetooth tarafından kullanılan pil"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Bluetooth\'u kullanmadığınız zamanlarda kapatın"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Farklı bir Bluetooth cihazına bağlanmaya çalışın"</string>
@@ -1427,7 +1455,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Konuşulan metnin sesini etkiler"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
-    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil tanımlı sesi, konuşulan metin için ayarlar"</string>
+    <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil için tanımlı sesi, konuşulan metin için ayarlar"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"Konuşma sentezinin kısa bir sunumunu çal"</string>
     <string name="tts_install_data_title" msgid="4264378440508149986">"Ses verilerini yükle"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Yapılandır"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Başka bir motor seç"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Bu konuşma sentezi motoru, şifreler ve kredi kartı numaraları gibi kişisel veriler de dahil konuşulan tüm metni toplayabilir. <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> motorundan gelmektedir. Bu konuşma sentezi motorunun kullanımı etkinleştirilsin mi?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Bu dil, metin-konuşma çıktısı için bir ağ bağlantısı gerektirir."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Motorlar"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ayarları"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> etkinleştirildi"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Tercih edilen motor"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Genel"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Güç denetimi"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Kablosuz ayarı güncelleniyor"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Kablosuz ayarı güncelleniyor"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Bluetooth ayarları güncelleniyor"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"açık"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"kapalı"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"açılıyor"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"kapatılıyor"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Kablosuz"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Kablosuz"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Senkronizasyon"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm sertifikaları kaldır"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Güvenilir kimlik bilgisi"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Güvenilir CA sertifikalarını görüntüle"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Depolama türü"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Donanım destekli"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Yalnızca yazılım"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Kilit açma deseninizi çizin"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Yedekleme ve geri yükleme"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Kişisel veriler"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Verilerimi yedekle"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Uygulama verilerini, Kablosuz şifrelerini ve diğer ayarları Google sunucularına 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="auto_restore_title" msgid="5397528966329126506">"Otomatik geri yükle"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Yeni şifre ve onayı eşleşmiyor."</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Yedek şifre ayarlanamadı"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Kablosuz şifrelerinizin, yer işaretlerinizin, diğer ayarlarınızın ve uygulama verilerinizin yedeklenmesi iptal edilip, Google sunucularındaki tüm kopyaları silinsin mi?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Kablosuz şifrelerinizin, yer işaretlerinizin, diğer ayarlarınızın ve uygulama verilerinizin yedeklenmesi iptal edilip, Google sunucularındaki tüm kopyaları silinsin mi?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Aygıt yönetimi ayarları"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Cihaz yöneticisi"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Etkinliğini Kaldır"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Bildirimler"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Çağrı zil sesi ve titreşim"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Kablosuz ayarı"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlan"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"<xliff:g id="NETWORK_NAME">%s</xliff:g> kablosuz ağına bağlanıyor..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlandı"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Kablosuz kurulumu"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlan"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"<xliff:g id="NETWORK_NAME">%s</xliff:g> kablosuz ağına bağlanıyor…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Ağ ekleyin"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Bağlanmadı"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ağ ekle"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Bağlanıyor..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Sonraki adıma git"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP desteklenmiyor."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Kurulum sırasında EAP Kablosuz bağlantısı yapılandıramazsınız. Kurulumdan sonra Ayarlar &gt; Kablosuz ve ağlar bölümünde bunu yapabilirsiniz."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Kurulum sırasında EAP Kablosuz bağlantısı yapılandıramazsınız. Kurulumdan sonra bunu, Ayarlar &gt; Kablosuz ve ağlar bölümünde yapabilirsiniz."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Bağlanma birkaç dakika sürebilir..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun."\n\n"Farklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun."\n\n"Farklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Senkronizasyon etkinleştirildi"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Senkronizasyon devre dışı"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Senkronizasyon hatası"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Hata ayıklanan uyg. çalıştırılmadan önce hata ayıklayıcının eklenmesini bekliyor"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Girdi"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Çizim"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Donanım hızlandırmalı oluşturma"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"İzleme"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Yüksek düzey modu etkin"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Uygulamalar uzun işlem yaparken flash ekranı."</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"En iyiden en kötüye: mavi, yeşil, açık kırmızı, kırmızı"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"HW katmanlarını devre dışı bırak"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"İzleri etkinleştir"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Etkin izleri seç"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Şu anda hiçbir iz etkin değil"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Şu anda <xliff:g id="NUM">%1$d</xliff:g> iz etkin"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tüm izler şu anda etkin"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"OpenGL izlerini etkinleştir"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Düzen sınırlarını göster"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Klip sınırlarını, kenar boşluklarını vb. göster"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"2D çizimde GPU kullanımını zorla"</string>
     <string name="force_msaa" msgid="7920323238677284387">"4x MSAA\'yı zorla"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"OpenGL ES 2.0 uygulamalarda 4x MSAA\'yı etkinleştir"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Dikdörtgen olmayan kırpma işlemlerinde hata ayıkla"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Profil GPU oluşturma"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Oluşturma süresini adb shell dumpsys gfxınfo içinde ölç"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Pencere animasyonu ölçeği"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Arka plan işlem sınırı"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Tüm ANR\'leri göster"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Arka plan uygulamalar için Uygulama Yanıt Vermiyor mesajını göster"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Deneysel WebView\'ı kullan"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Uygulamalar en yeni (beta) WebView\'ı kullanacaklar"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Veri kullanımı"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Veri kullanım dönemi"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Veri dolaşımında"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Arka pl veri sınırla"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ayrı 4G kullanımı"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Kablosuz kullanımını göster"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Kablosuz kullanımı göster"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Ethernet kullanımını göster"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Mobil hotspot\'lar"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Verileri otomatik senkronize et"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Mobil veri limitini ayarla"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G veri limitini ayarla"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G veri limitini ayarla"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Kablosuz veri limitini ayarla"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Kablosuz"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Kablosuz veri limitini ayarla"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Kablosuz"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobil"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı tabletiniz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Belirtilen limite ulaşıldığında mobil veri bağlantınız kesilecektir."\n\n"Veri kullanımı telefonunuz tarafından ölçüldüğünden operatörünüzün kullanım hesaplaması farklı olabilir. Bu nedenle, risk almadan güvenli bir limit belirleyin."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Arka plan verileri kısıtlansın mı?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Arka plan mobil verilerini kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Arka planda işlenen mobil verileri kısıtlarsanız, Kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmayacaktır."\n\n"Bu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Arka planda işlenen mobil verileri kısıtlarsanız, Kablosuz ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmayacaktır."\n\n"Bu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."\n\n"Bu ayar, bu tabletteki tüm kullanıcıları etkiler."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Arka planda mobil veri kullanımını kısıtlarsanız, Kablosuz bir ağa bağlanmadığınız sürece bazı uygulamalar ve hizmetler çalışmaz."\n\n"Bu ayar, bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"uyarı"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"sınır"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Kaldırılan uygulamalar"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı (tabletinizin ölçümü). Operatörünüzün veri kullanımı hesaplaması farklı olabilir."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: yaklaşık <xliff:g id="TOTAL">%1$s</xliff:g> kullanıldı (telefonunuzun ölçümü). Operatörünüzün veri kullanımı hesaplaması farklı olabilir."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Mobil hotspot\'lar"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Mobil hotspot olan Kablosuz ağları seçin. Arka planda çalışırken uygulamaların bu ağları kullanmaları kısıtlanabilir. Uygulamalar ayrıca yüksek hacimli indirme işlemleri için bu ağları kullanmadan önce kullanıcıyı uyarabilir."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Mobil hotspot olan Kablosuz ağları seçin. Arka planda çalışırken uygulamaların bu ağları kullanmaları kısıtlanabilir. Uygulamalar ayrıca yüksek hacimli indirme işlemleri için bu ağları kullanmadan önce kullanıcıyı uyarabilir."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mobil ağlar"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Kablosuz ağlar"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Mobil hotspot\'ları seçmek için Kablosuz\'u açın."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Kablosuz ağlar"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Mobil hotspot\'ları seçmek için Kablosuz\'u açın."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Acil durum çağrısı"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Çağrıya dön"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Ad"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Permissive (Serbest)"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Enforcing (Zorunlu)"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Kullanıcılar"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Siz"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Diğer kullanıcılar"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Kullanıcı ekle"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Etkin"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Etkin değil"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Kullanıcılar ve Profiller"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Kullanıcı veya profil ekle"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Kısıtlı profil"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Kısıtlanmış bir profil oluşturabilmeniz için uygulamalarınızı ve kişisel verilerinizi korumak üzere bir ekran kilidi oluşturmanız gerekir."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Kilidi ayarla"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Yapılandırılmadı"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Yapılandırılmadı - Kısıtlı profil"</string>
     <string name="user_owner" msgid="3879126011135546571">"Sahibi"</string>
+    <string name="user_you" msgid="1639158809315025986">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Takma Ad"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Ekle"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Kullanıcıların kendi uygulamaları ve içerikleri var"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Hesabınızdaki uygulamalara ve içeriğe erişimi kısıtlayabilirsiniz"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Kullanıcı"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Kısıtlı profil"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Yeni kullanıcı ekle"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ek kullanıcılar yaratarak bu cihazı başka kişilerle paylaşabilirsiniz. Her kullanıcının kendine ait alanı olur ve bu alanı kendi uygulamaları, duvar kâğıdı vb. ile özelleştirebilir. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyebilecek tablet ayarlarını da yapabilirler."\n\n"Yeni bir kullanıcı oluşturduktan sonra, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ek kullanıcılar yaratarak bu cihazı başka kişilerle paylaşabilirsiniz. Her kullanıcının kendine ait alanı olur ve bu alanı kendi uygulamaları, duvar kâğıdı vb. ile özelleştirebilir. Kullanıcılar, Kablosuz bağlantı gibi herkesi etkileyebilecek tablet ayarlarını da yapabilirler."\n\n"Yeni bir kullanıcı oluşturduğunuzda, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Yeni bir kullanıcı oluşturduktan sonra, o kişinin bir kurulum işlemini tamamlaması gerekir."\n\n"Herhangi bir kullanıcı, güncellenen uygulama izinlerini diğer kullanıcıların adına kabul edebilir."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Kullanıcı şimdi yapılandırılsın mı?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"İlgili kişinin tableti almak ve kendi alanının kurulumunu yapmak için müsait olduğundan emin olun"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Profil şimdi yapılandırılsın mı?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Şimdi ayarla"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Şimdi değil"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Yalnızca tabletin sahibi kullanıcıları yönetebilir."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Yalnızca telefonun sahibi kullanıcıları yönetebilir."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Kısıtlanmış profiller hesap ekleyemez"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Bu cihazdan sil: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Yeni kullanıcı"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Yeni profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kendinizi silmek istiyor musunuz?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Kullanıcı kaldırılsın mı?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Profil kaldırılsın mı?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Bu tabletteki alanınızı ve verilerinizi kaybedeceksiniz. Bu işlemi geri alamazsınız."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Bu telefondaki alanınızı ve verilerinizi kaybedeceksiniz. Bu işlemi geri alamazsınız."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Kullanıcının alanı ve verileri bu tabletten silinecek. Bu işlemi geri alamazsınız."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Kullanıcının alanı ve verileri bu telefondan silinecek. Bu işlemi geri alamazsınız."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Bu profilin alanı ve verileri bu tabletten silinecek. Bu işlemi geri alamazsınız."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Bu profilin alanı ve verileri bu telefondan silinecek. Bu işlemi geri alamazsınız."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Yeni kullanıcı ekleniyor..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Kullanıcıyı sil"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Sil"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Bu ayar bu tabletteki tüm kullanıcıları etkiler."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Bu ayar bu telefondaki tüm kullanıcıları etkiler."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Dili değiştir"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Hücre yayınları"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Görüntülenecek acil durum uyarı türünü seçin."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Uygulama ve içerik kısıtlamaları"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ADI DEĞİŞTİR"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"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="restriction_wifi_config_title" msgid="8889556384136994814">"Kablosuz ve Mobil"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Kablosuz ve Mobil ayarlarını değiştirmeye izin ver"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth eşleşmelerini ve ayarlarını değiştirmeye izin ver"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Tablet başka cihaza dokunduğunda veri alışverişine izin ver"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Telefon başka cihaza dokunduğunda veri alışverişine izin ver"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Konum erişimi"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Uygulamanın konum bilgilerimi kullanmasına izin ver"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Geri"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"İleri"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Son"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Fotoğraf çek"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Galeri\'den fotoğraf seçin"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 5a47d0d..86ed51b 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Повільний"</item>
     <item msgid="1145554631248513562">"Звичайний"</item>
     <item msgid="7553665153391107454">"Швидкий"</item>
-    <item msgid="2538100882620724753">"Дуже швидко"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Нічого"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Немає"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Не вказано"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Немає"</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">"Внутрішня пам\'ять пристрою"</item>
     <item msgid="3738430123799803530">"Знімна карта SD"</item>
     <item msgid="4498124044785815005">"Дозвольте виріш. системі"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Місцезнаходження"</item>
+    <item msgid="255608127647030286">"Особисті дані"</item>
+    <item msgid="4588829735729884491">"Повідомлення"</item>
+    <item msgid="8971765125227378270">"Пристрій"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"приблизне місцезнаходження"</item>
+    <item msgid="5789673140227507995">"точне місцезнаходження"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"вібросигнал"</item>
+    <item msgid="3434165993711230924">"читати контакти"</item>
+    <item msgid="616161687718081936">"змінювати контакти"</item>
+    <item msgid="7638002295329050091">"читати журнал викликів"</item>
+    <item msgid="6546959730920410907">"змінювати журнал викликів"</item>
+    <item msgid="446877710771379667">"переглядати календар"</item>
+    <item msgid="7674458294386319722">"змінювати календар"</item>
+    <item msgid="8281201165558093009">"сканування Wi-Fi"</item>
+    <item msgid="8694611243479480497">"сповіщення"</item>
+    <item msgid="7776439107987345446">"пошук мобільних мереж"</item>
+    <item msgid="514615766544675057">"телефонувати"</item>
+    <item msgid="8181415497109310680">"читати SMS"</item>
+    <item msgid="6816551144382117307">"писати SMS"</item>
+    <item msgid="4600463921908905030">"отримувати SMS"</item>
+    <item msgid="5958926493289432745">"отримувати екстрені SMS"</item>
+    <item msgid="4945269495221089540">"отримувати MMS"</item>
+    <item msgid="5570472453573929087">"отримувати WAP Push"</item>
+    <item msgid="7125408150230860501">"надсилати SMS"</item>
+    <item msgid="7080337936612188061">"читати ICC SMS"</item>
+    <item msgid="587124103118495063">"писати ICC SMS"</item>
+    <item msgid="2320577158869025503">"змінювати налаштування"</item>
+    <item msgid="1545733463471924009">"відображати зверху"</item>
+    <item msgid="3609046903962454582">"отримувати доступ до сповіщень"</item>
+    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="1097324338692486211">"записувати аудіо"</item>
+    <item msgid="5031552983987798163">"відтворювати аудіо"</item>
+    <item msgid="8374996688066472414">"читати буфер обміну"</item>
+    <item msgid="3045529469061083747">"змінювати буфер обміну"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Місцезнаходження"</item>
+    <item msgid="8677040780775113033">"Місцезнаходження"</item>
+    <item msgid="1660743989948992916">"Місцезнаходження"</item>
+    <item msgid="8791172739860195290">"Вібросигнал"</item>
+    <item msgid="383413555642128046">"Читати контакти"</item>
+    <item msgid="3654594895269697313">"Змінювати контакти"</item>
+    <item msgid="7928393476362362538">"Читати журнал викликів"</item>
+    <item msgid="6248591205254641116">"Змінювати журнал викликів"</item>
+    <item msgid="6093344633066170692">"Переглядати календар"</item>
+    <item msgid="1334886368750347692">"Змінювати календар"</item>
+    <item msgid="1638204101698708656">"Місцезнаходження"</item>
+    <item msgid="2154671955760380322">"Публікувати сповіщення"</item>
+    <item msgid="4282477730595931828">"Місцезнаходження"</item>
+    <item msgid="4891423912898525905">"Телефонувати"</item>
+    <item msgid="626463821668200388">"Отримувати SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Надсилати SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Отримувати SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Отримувати SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Отримувати SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Отримувати SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Надсилати SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Отримувати SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Надсилати SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Змінювати налаштування"</item>
+    <item msgid="736541391767350377">"Відображати зверху"</item>
+    <item msgid="5530815681721654194">"Отримувати доступ до сповіщень"</item>
+    <item msgid="781213371706962767">"Камера"</item>
+    <item msgid="1720492593061838172">"Записувати аудіо"</item>
+    <item msgid="3493046322001257041">"Відтворювати аудіо"</item>
+    <item msgid="136815868796597058">"Читати буфер обміну"</item>
+    <item msgid="5238692940326972503">"Змінювати буфер обміну"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Коротка"</item>
     <item msgid="2560532955514699713">"Середня"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (графіка)"</item>
     <item msgid="1340692776955662664">"Стек викликів glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"На екрані у вигляді смужок"</item>
+    <item msgid="8272260411216018353">"На екрані у вигляді ліній"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Стандартне обмеження"</item>
     <item msgid="4071574792028999443">"Без фонових процесів"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index aef2782..99f6ef3 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -74,18 +74,18 @@
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
     <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Носій USB"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"Карта SD"</string>
-    <string name="battery_info_status_label" msgid="8109155295509700309">"Стан батареї:"</string>
+    <string name="battery_info_status_label" msgid="8109155295509700309">"Стан акумулятора:"</string>
     <string name="battery_info_power_label" msgid="7465140230991349382">"Роз\'єм живл.:"</string>
-    <string name="battery_info_scale_label" msgid="3649763192389778437">"Заряд батареї:"</string>
-    <string name="battery_info_level_label" msgid="8706526709307788737">"Рівень батареї:"</string>
-    <string name="battery_info_health_label" msgid="6416051542741886958">"Працездат. бат.:"</string>
-    <string name="battery_info_technology_label" msgid="788304533220748681">"Технологія батареї:"</string>
-    <string name="battery_info_voltage_label" msgid="8971764146757637863">"Напруга батареї:"</string>
+    <string name="battery_info_scale_label" msgid="3649763192389778437">"Заряд акумулятора:"</string>
+    <string name="battery_info_level_label" msgid="8706526709307788737">"Рівень заряду:"</string>
+    <string name="battery_info_health_label" msgid="6416051542741886958">"Рівень заряду:"</string>
+    <string name="battery_info_technology_label" msgid="788304533220748681">"Технологія акумулятора:"</string>
+    <string name="battery_info_voltage_label" msgid="8971764146757637863">"Напруга акумулятора:"</string>
     <string name="battery_info_voltage_units" msgid="8658490792208288107">"mV"</string>
-    <string name="battery_info_temperature_label" msgid="1968383098818648037">"Температура батареї:"</string>
+    <string name="battery_info_temperature_label" msgid="1968383098818648037">"Температура акумулятора:"</string>
     <string name="battery_info_temperature_units" msgid="9098950587249987550">"° C"</string>
     <string name="battery_info_uptime" msgid="5548545143573527992">"Час від завантаж.:"</string>
-    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Час активності батареї:"</string>
+    <string name="battery_info_awake_battery" msgid="2557725975486185849">"Час роботи акумулятора:"</string>
     <string name="battery_info_awake_plugged" msgid="176716874713478188">"Час активності при зарядж.:"</string>
     <string name="battery_info_screen_on" msgid="376277447175613889">"Час АКТИВ. екрана:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Невідомо"</string>
@@ -254,7 +254,7 @@
     <string name="language_picker_title" msgid="5349877711342869319">"Мова"</string>
     <string name="activity_picker_label" msgid="6295660302548177109">"Вибрати дію"</string>
     <string name="device_info_label" msgid="6551553813651711205">"Інф-я пристрою"</string>
-    <string name="battery_info_label" msgid="4132685016148679403">"Інф-я батареї"</string>
+    <string name="battery_info_label" msgid="4132685016148679403">"Інформація про акумулятор"</string>
     <string name="display_label" msgid="8074070940506840792">"Екран"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Інф. про прис."</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Інф-я тел-ну"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Режим польоту"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Більше..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бездротовий зв\'язок і мережі"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Керуйте Wi-Fi, Bluetooth, реж. польоту, мобільними мережами та VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Керуйте Wi-Fi, Bluetooth, режимом польоту, мережами мобільного зв’язку та VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Роумінг даних"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Підключ. до служб даних під час роумінгу"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Підключ. під час роумінгу до служб даних"</string>
@@ -304,11 +304,13 @@
     <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="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показувати інф-цію про власника на заблок. екрані"</string>
-    <string name="owner_info_settings_title" msgid="2723190010708381889">"Інф-ція про власника"</string>
+    <string name="owner_info_settings_title" msgid="2723190010708381889">"Інфо про власника"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введіть текст, що відображ. на екрані блокування"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показувати дані користувача на екрані блокування"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Дані користувача"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показувати інформацію профілю на екрані блокування"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Інформація профілю"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Доступ до місцезнаходження"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Безпека"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
@@ -324,7 +326,7 @@
     <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних."\n\n"Шифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть батарею й повторіть спробу."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть акумулятор і повторіть спробу."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Підключіть зарядний пристрій і повторіть спробу."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Потрібно ввести PIN-код або пароль для блокування екрана"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Щоб почати шифрування, потрібно встановити PIN-код або пароль для блокування екрана."</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Адміністрація пристрою"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Адміністратори пристрою"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи відключити адміністраторів пристрою"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"Доступ до сповіщень"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Увімк. Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запам\'ятати налашт."</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Бездротовий екран"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Щоб переглянути пристрої, увімкніть бездротовий екран."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Бездротовий екран вимкнено, оскільки вимкнено Wi-Fi."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Бездротовий екран вимкнено, оскільки вимкнено Wi-Fi."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Пошук пристроїв"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Пошук…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Бездротові пристрої поблизу не знайдено."</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Увімкнути Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Налашт-ня Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Увімкнути Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Налаштування Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Налашт. і керуйте бездрот. точками доступу"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Вибрати Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Увімкнення Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Вимкнення Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Вибрати Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Увімкнення Wi‑Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"Вимкнення Wi‑Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Помилка"</string>
     <string name="wifi_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="3038290727701553612">"Сповіщати мене про доступність відкритої мережі"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Уникати слабких з’єднань"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Не від’єднуватися від мережі WiFi у режимі сну"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"Не використовувати мережу Wi-Fi, якщо немає стійкого з’єднання з Інтернетом"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"Сканування завжди доступне"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Дозволити службі локації Google та інших програмам сканувати мережі, навіть якщо Wi-Fi вимкнено."</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Установити сертифікати"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей Google та інші програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Програми можуть шукати мережі поблизу, навіть якщо Wi-Fi вимкнено. Щоб скасувати цей дозвіл, перейдіть у меню Розширені &gt; Сканування завжди доступне."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Більше не показувати"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Не від’єднуватися від Wi‑Fi у режимі сну"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Виникла проблема зі зміною налаштувань"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Оптимізація Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Мінімізувати використання заряду акумулятора, коли ввімкнено Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Оптимізація Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Мінімізувати використання акумулятора, коли ввімкнено Wi‑Fi"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Додати мережу"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi мережі"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Мережі Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Кнопка WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Інші параметри"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Введення PIN-коду WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Підключ. до мережі"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Видалити мережу"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змінити мережу"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Щоб переглянути доступні мережі, увімкніть Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Пошук мереж Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Щоб переглянути доступні мережі, увімкніть Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Пошук мереж Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"У вас немає дозволу на змінення мережі Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Інша мережа…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Більше"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Авто-налаштування (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Щоб завершити налаштування, вашому планшетному ПК потрібен доступ до Wi-Fi. Після налаштування можна переключатися між мобільним передаванням даних і Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Щоб завершити налаштування, вашому планшетному ПК потрібен доступ до мережі Wi-Fi. Після налаштування можна переключатися між мобільним передаванням даних і Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Показати розширені параметри"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі Wi-Fi"</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="7204827509934892103">"Натисніть кнопку \"Налаштування захищеної мережі Wi-Fi\" на маршрутизаторі. Вона може називатися \"WPS\" або містити такий символ:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Введіть PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на своєму маршрутизаторі Wi-Fi. Налаштування може тривати не більше двох хвилин."</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Натисніть кнопку \"Налаштування захищеної мережі 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="5754399645462924103">"З’єднано з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Під’єднано до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Налаштування WPS уже виконується. Для його завершення потрібно не більше двох хвилин"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Помилка WPS. Повторіть спробу через декілька хвилин."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налаштування безпеки бездротового маршрутизатора (WEP) не підтримується"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Помилка автентифікації. Повторіть спробу."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Виявлено ще один сеанс WPS. Повторіть спробу через декілька хвилин."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID мережі"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Введіть ідентифікатор SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Безпека"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Сила сигналу:"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Стан"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Відхилити"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Підключ."</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Помилка під’єднання до мережі."</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Видалити"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Не пропускати"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ЗАСТЕРЕЖЕННЯ. Оператор може стягувати з вас додаткову плату."\n\n"Для налаштування планшетного ПК може знадобитися тривале користування мережею."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ЗАСТЕРЕЖЕННЯ. Оператор може стягувати з вас додаткову плату."\n\n"Для налаштування телефону може знадобитися тривале користування мережею."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ЗАСТЕРЕЖЕННЯ: планшетний ПК не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ЗАСТЕРЕЖЕННЯ: телефон не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Планшетний ПК не зміг під’єднатися до цієї мережі Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Телефон не зміг під’єднатися до цієї мережі Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Розширені налаштування Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Діапазон частот Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ЗАСТЕРЕЖЕННЯ. Якщо немає з’єднання з Інтернетом, планшетний ПК не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ЗАСТЕРЕЖЕННЯ. Якщо немає з’єднання з Інтернетом, телефон не зможе перевірити, чи оновлено ваше програмне забезпечення."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Планшетний ПК не зміг під’єднатися до цієї мережі Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Телефон не зміг під’єднатися до цієї мережі Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Розширені налаштування Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Діапазон частот Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Укажіть діапазон частот операції"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Виникла проблема із встановл. діапазону частот."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адреса"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Довжина префіксу мережі"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Інформація про пристрій"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Запам’ятати це з’єднання"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Пошук пристроїв"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Видалити цю групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Портат. точка дост. Wi-Fi"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Портативна точка доступу Wi‑Fi"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Увімкнення точки доступу…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Вимкнення точки доступу…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Порт. точка дост. <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Помилка порт. точки дост. Wi-Fi"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Налаштувати точку доступу Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"Помилка портативної точки доступу Wi‑Fi"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Налаштувати точку доступу Wi‑Fi"</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="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
@@ -709,7 +731,7 @@
     <string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Керуйте налаштув. пошуку та історією"</string>
     <string name="display_settings" msgid="7965901687241669598">"Екран"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Поверт. екран автом."</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Автоповорот екрана"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Автомат. переключ. орієнтацію під час обертання пристрою"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Автомат. переключ. орієнтацію при обертанні телефону"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Автомат. переключ. орієнтацію під час обертання пристрою"</string>
@@ -770,7 +792,7 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Недоступний"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Стан"</string>
     <string name="device_status" msgid="607405385799807324">"Стан"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Стан батареї, мережі та інша інформація"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Стан акумулятора, мережі та інша інформація"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Номер телефону, сигнал тощо"</string>
     <string name="storage_settings" msgid="4211799979832404953">"Пам\'ять"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Налаштування пам’яті"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Сила сигналу:"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Роумінг"</string>
     <string name="status_operator" msgid="2274875196954742087">"Мережа"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"MAC-адреса Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"MAC-адреса Wi-Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Адреса Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Серійний номер"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Недоступне"</string>
@@ -850,8 +872,8 @@
     <string name="usb_ptp_summary" msgid="7673397474756664929">"Дозволяє передавати фото за допомогою програмного забезпечення камери, а також передавати будь-які файли на комп’ютери, які не підтримують MTP"</string>
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Установити інструменти передавання файлів"</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>
+    <string name="battery_status_title" msgid="9159414319574976203">"Стан акумулятора"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Рівень заряду акумулятора"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Редаг. точку доступу"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Не встановлено"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN увімкнено"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN вимкнено"</string>
     <string name="bearer" msgid="594270280031923558">"Власник"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Тип MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Значення MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Видалити APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"Нова APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Зберег."</string>
@@ -891,7 +915,7 @@
     <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="master_clear_title" msgid="5907939616087039756">"Відновл. завод. нал."</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>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Довідка"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Мобільні мережі"</string>
     <string name="location_title" msgid="1029961368397484576">"Моє місцезнах."</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Місцезнах. Wi-Fi і моб. мереж"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Місцезнах. Wi-Fi і моб. мережі"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"Місцезнаходження, визначене Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Місцезнаходження, визначене Wi-Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Супутникові тарілки GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Дозвольте програмам використовувати GPS на планшетному ПК для точного визначення місцезнаходження"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Дозвольте програмам використовувати GPS на телефоні для точного визначення місцезнаходження"</string>
@@ -966,7 +990,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"Викор. сервер, щоб доп. GPS (знім. прап., щоб покращ. роб. GPS)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"Місцезнаходж. і пошук Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"Дозволити Google використовувати місцезнаходження для покращення результатів пошуку й інших служб"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"Доступ до мого місцезнаходження"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"Доступ до моїх геоданих"</string>
     <string name="location_access_summary" msgid="69031404093194341">"Надати програмам, які про це попросили, дозвіл на використання інформації про місцезнаходження"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Джерела даних про місцезнаходження"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Про пристрій"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Фільтрув."</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Вибрати параметри фільтра"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Усі"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Вимкнені"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Завантажені"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Запущені"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Носій USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Якщо вимкнути вбудовану програму, інші програми можуть працювати неналежним чином. Ваші дані також буде видалено."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Вимкнути сповіщення?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Якщо вимкнути сповіщення для цієї програми, можна пропустити важливі повідомлення й оновлення."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Операції програми"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Виконується"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Ніколи не використовується)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Використання пам\'яті"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Переглянути пам’ять, яку використовують програми"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Запущені служби"</string>
@@ -1192,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Налашт. фізичної клавіатури"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Натис. пробіл двічі, щоб встав. \".\""</string>
     <string name="show_password" msgid="3001113966880559611">"Зробити паролі видимими"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"Цей метод введення може записувати весь текст, який ви вводите, зокрема такі особисті дані, як паролі й номери кредитних карток. Він походить від програми <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Використати цей метод введення?"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"Під час використання цього методу введення може записуватись весь текст, який ви вводите, зокрема паролі й номери кредитних карток. Цей метод запитує програма <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. Використати цей метод введення?"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Цей засіб перевірки правопису може збирати весь введений вами текст, зокрема такі особисті дані, як паролі та номери кредитних карток. Він походить від програми <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Використати цей засіб перевірки правопису?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Налаштування"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Мова"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Слово:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Ярлик:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Мова:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Введіть слово"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Необов’язковий ярлик"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Редаг. слово"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Редаг."</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Видалити"</string>
@@ -1229,7 +1259,7 @@
     <string name="testing" msgid="6584352735303604146">"Тестування"</string>
     <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Інф-ція про пристрій"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Інф-я тел-ну"</string>
-    <string name="testing_battery_info" msgid="3497865525976497848">"Інф-я батареї"</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>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Налаштування фізичної клавіатури"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Параметри розробника"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Установити параметри для розробки програми"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Параметри розробника не доступні для цього користувача"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Налагодження USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Реж. налагодж., коли підкл. ч-з USB"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Скасувати доступ до налагодження USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Повідомлення про помилки в меню \"Живлення\""</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Внести в меню \"Живлення\" опцію створення повідомлень про помилку"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Залишати активним"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Дозволити налаштування розробки?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Ці налаштування застосовуються лише з метою розробки. Вони можуть спричиняти вихід з ладу або неправильне функціонування вашого пристрою чи програм у ньому."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Перевіряти програми (з USB)"</string>
@@ -1311,47 +1344,42 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Збільшення екрана"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Автоматично оновлювати збільшення"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Оновлювати збільшення екрана в інших програмах"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кнопка живлення закінчує виклик"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кнопка живл. закінчує виклик"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Диктувати паролі"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Затримка натискання й утримування"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Покращувати веб-доступність"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Налаштування"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Увімкнено"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Вимкнено"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Дозволено"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Не дозволено"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Дозволити"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Не дозволяти"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Використовувати службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> може збирати весь введений вами текст, окрім паролів. Це включає особисті дані, як-от номери кредитних карток. Також можуть збиратися дані про вашу взаємодію з планшетним ПК."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> може збирати весь введений вами текст, окрім паролів. Це включає особисті дані, як-от номери кредитних карток. Також можуть збиратися дані про вашу взаємодію з телефоном."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Зупинити службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Торкніться ОК, щоб зупинити службу <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Спостерігати за вашими діями"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Отримувати сповіщення під час вашої взаємодії з програмою."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Зупинити <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Торкніться ОК, щоб зупинити <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Не встановлено жодної служби"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Потрібна програма зчитування з екрана?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"Функція TalkBack забезпечує мовне голосове відтворення для користувачів із вадами зору. Хочете встановити її безкоштовно з Android Market?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Дозволити програмам установлювати сценарії від Google, які зроблять веб-вміст більш доступним?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Немає опису."</string>
     <string name="settings_button" msgid="3006713718908152930">"Налаштування"</string>
-    <string name="power_usage_summary_title" msgid="7190304207330319919">"Батарея"</string>
-    <string name="power_usage_summary" msgid="7237084831082848168">"На що було використано батарею"</string>
-    <string name="power_usage_not_available" msgid="3214000535532434353">"Статист. викор. батареї недост."</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Акумулятор"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"На що споживається заряд акумулятора"</string>
+    <string name="power_usage_not_available" msgid="3214000535532434353">"Дані використання акумулятора недоступні"</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="STATUS">%2$s</xliff:g>"</string>
-    <string name="battery_since_unplugged" msgid="338073389740738437">"Викор. батареї з часу відключ."</string>
-    <string name="battery_since_reset" msgid="7464546661121187045">"Викор. бат. з часу скид."</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> від батареї"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Споживання акумулятора з часу відключення"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Споживання акумулятора з моменту перезавантаження"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> від акумулятора"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> з часу відключ."</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Заряджається"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Екран увімкнено"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS увімкнено"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Час активності"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сигнал мобільної мережі"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Час активн. пристрою"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Час роботи Wi-Fi"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Час роботи Wi-Fi"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Час роботи Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Час роботи Wi-Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> –  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Деталі історії"</string>
     <string name="details_title" msgid="3792801565213935385">"Деталі використання"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Налашт. викор.живл."</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Уключені пакети"</string>
     <string name="power_screen" msgid="3023346080675904613">"Екран"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Тел.у реж.очік."</string>
     <string name="power_phone" msgid="5392641106474567277">"Голос. дзвінки"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Актив. процеси ЦП"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Залишати активним"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi працює"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi працює"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Пристрій"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Телефон"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Надісл. дані"</string>
@@ -1382,25 +1410,25 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Інформація про програму"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Налаштування програми"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Налаштування екрана"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Налашт-ння Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Налаштування Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Налашт-ня Bluetooth"</string>
-    <string name="battery_desc_voice" msgid="8980322055722959211">"Викор. бат. голос. дзвінками"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Використ. батареї в режимі очікув."</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Викор. батареї в режимі очікув."</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"Викор. батареї моб-ним радіо"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Споживання заряду акумулятора для голосових дзвінків"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Споживання заряду акумулятора в режимі очікування"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Споживання заряду акумулятора в режимі очікування"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Споживання заряду акумулятора для стільникової мережі"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Переключ. в реж. польоту для збереж. живл. в обл. без мобіл. покриття"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"Викор. батареї екраном і підсвічув."</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Використання акумулятора для підсвічування екрана"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Зменште яскравість і/чи час очікування екрана"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Викор. батареї Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Вимкніть Wi-Fi, якщо з’єднання не використовується чи не доступне"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Як Bluetooth використовує батарею"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Використання акумулятора мережею Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Вимкніть Wi-Fi, якщо з’єднання не використовується чи не доступне"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Як Bluetooth використовує акумулятор"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Вимкніть Bluetooth, якщо він не використовується"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Спробуйте з’єднатися з іншим пристроєм Bluetooth"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Як програма використовує батарею"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Як програма використовує акумулятор"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Зупиніть або видаліть цю програму"</string>
     <string name="battery_sugg_apps_gps" msgid="7287643439298561315">"Контролювати GPS вручну, щоб запобігти її використанню програмою"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Програма може пропонувати налаштування, щоб зменшити використання батареї"</string>
-    <string name="battery_desc_users" msgid="7682989161885027823">"Батарея користувача"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"У програмі можуть бути налаштування режиму енергозбереження"</string>
+    <string name="battery_desc_users" msgid="7682989161885027823">"Використання акумулятора користувачем"</string>
     <string name="menu_stats_unplugged" msgid="8296577130840261624">"<xliff:g id="UNPLUGGED">%1$s</xliff:g> з часу відключ."</string>
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"З часу ост. відключ. для <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"Заг. використ."</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Налаштувати"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Вибрати іншу систему"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Ця система синтезу мовлення може збирати всі відтворювані тексти, зокрема особисті дані, такі як паролі та номери кредитних карток. Вона походить від системи <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Увімкнути використання цієї системи синтезу мовлення?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Для виходу синтезу мовлення цією мовою потрібно мати з’єднання з Інтернетом."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Системи"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Налашт-ня <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> увімкнено"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Бажана система"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Загальні"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Контроль живлення"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Оновлення налашт. Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Оновлення налаштувань Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Оновлення налашт. Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"увімкнено"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"вимкнено"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"увімкнення"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"вимкнення"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Синхронізація"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Видалити всі сертифікати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надійні облікові дані"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показати надійні сертифікати ЦС"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Тип сховища"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Апаратне забезпечення"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Лише програмне забезпечення"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйте ключ розблокування"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Резервне копіювання та відновлення"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Особисті дані"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Рез. коп. даних"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Створювати резервні копії даних програми, паролів Wi-Fi та інших налаштувань на серверах Google"</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="auto_restore_title" msgid="5397528966329126506">"Автомат. відновлення"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Новий пароль і підтвердження не збігаються"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Помилка встановлення пароля резервної копії"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Припинити створення резервних копій паролів Wi-Fi, закладок, інших налаштувань і даних програм і стерти всі копії на серверах Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Припинити створення резервних копій паролів Wi-Fi, закладок, інших налаштувань і даних програм, а також стерти всі копії на серверах Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Налашт-ня адміністрації пристрою"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Адміністратор пристрою"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Деактивувати"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Сповіщення"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Сигнал і вібрація під час виклику"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Система"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Налаштування Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"З\'єднатися з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Під’єднання до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"З\'єднано з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Налаштування Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Під’єднатися до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Під’єднання до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Під’єднано до мережі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Додати мережу"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Не з\'єднано"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Додати мережу"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Під’єднання..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Перейти до наступного кроку"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP не підтримується."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Під час налаштування неможливо встановити параметри з’єднання Wi-Fi через протокол EAP. Це можна зробити після налаштування в меню Налаштування &gt; Бездротовий зв’язок і мережі."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Під час налаштування неможливо встановити параметри з’єднання Wi‑Fi через протокол EAP. Це можна зробити після налаштування в меню Налаштування &gt; Бездротовий зв’язок і мережі."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Під’єднання може тривати кілька хвилин..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування."\n\n"Торкніться опції "<b>"Назад"</b>", щоб з\'єднатися з іншою мережею Wi-Fi."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування."\n\n"Торкніться опції "<b>"Назад"</b>", щоб під’єднатися до іншої мережі Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронізацію ввімкнено"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронізацію вимкнено"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Помилка синхронізації"</string>
@@ -1569,7 +1601,7 @@
     <string name="background_data" msgid="5779592891375473817">"Фонові дані"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Програми можуть будь-коли синхроніз., надсил. й отрим. дані"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Вимкн. фонові дані?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Вимкнення фонових даних продовжує час роботи батареї та зменшує використання даних. Деякі програми все ще можуть використовувати передавання даних у фоновому режимі."</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Вимкнення фонових даних заощаджує споживання акумулятора та зменшує використання даних. Деякі програми все одно можуть використовувати передавання фонових даних."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Автомат. синхронізув. дані програми"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Синхроніз. ВВІМКНЕНО"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Синхроніз. ВИМКНЕНО"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Програма для налагодження очікує на налагоджувач для виконання"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Ввід"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Рисування"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Апаратне прискорення"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Моніторинг"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Строгий режим увімкнено"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Підсвіч. екран, коли прогр. довго працюють в осн. потоці"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Від кращого до гіршого: синій, зелений, світло-червоний, червоний"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Вимк. апаратн. накладання"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Увімкнути трасування"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Вибрати ввімкн.трасування"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Усі трасування зараз вимкнено"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Зараз увімкнено стільки трасувань: <xliff:g id="NUM">%1$d</xliff:g>"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Усі трасування зараз увімкнено"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Увімк. трасування OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Показувати межі макета"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Показувати межі роликів, поля тощо"</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Примусово використовувати GPU для 2D-малювання"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Примус. запустити 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Увімкнути 4x MSAA в програмах OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Налагоджувати операції непрямокутного обрізування"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Запис часу роботи GPU"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Вимірювати час роботи в adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Ступінь анімації вікна"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"Ступінь анімації переходу"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"Тривалість анімації"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Обмеження фон. процесів"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Показати всі вікна ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Показ.вікно \"Прог. не відповідає\" для фонов.прогр."</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Викор. експерим. WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Програми будуть використ. найновіш. (бета) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Використання даних"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл використання даних"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Роумінг даних"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Обмежити фонові дані"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Відокремити використання 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Показувати використання Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Показувати викор-ня Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Показати використання Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Мобільні точки доступу"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Автосинхронізація даних"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Установити ліміт мобільних даних"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Установити ліміт даних 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Установити ліміт даних 2G – 3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Установити ліміт даних Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Установ. ліміт даних Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Мобільні"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних планшетного ПК й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Мобільне передавання даних буде вимкнено в разі досягнення вказаного ліміту."\n\n"Оскільки методи обліку використання даних телефону й оператора можуть відрізнятися, радимо використовувати занижений ліміт."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Обмежити використання фонових даних?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Якщо обмежити фонові мобільні дані, деякі програми та служби не працюватимуть, якщо немає з’єднання з мережею Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього планшетного ПК."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього телефону."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього планшетного ПК."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Якщо обмежити мобільне передавання даних у фоновому режимі, деякі програми та служби працюватимуть лише під час з’єднання з мережею Wi-Fi."\n\n"Таке налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"застереження"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"максимум"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Видалені програми"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (дані, визначені телефоном). Дані оператора можуть відрізнятись."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: <xliff:g id="TOTAL">%1$s</xliff:g> (дані, визначені телефоном). Дані оператора можуть відрізнятись."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Мобільні точки доступу"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Виберіть мережі Wi-Fi, які є мобільними точками доступу. Програмам можна заборонити користуватися цими мережами у фоновому режимі. Також можна створити попередження, якщо такі мережі потрібні програмам для великих завантажень."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Виберіть мережі Wi-Fi, які є мобільними точками доступу. Програмам можна заборонити користуватися цими мережами у фоновому режимі. Також можна створити попередження, якщо такі мережі потрібні програмам для великих завантажень."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Мобільні мережі"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Мережі Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Щоб вибрати мобільні точки доступу, увімкніть Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Мережі Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Щоб вибрати мобільні точки доступу, увімкніть Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Аварійний виклик"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Повернутися до дзвінка"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Назва"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Дозволено"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Застосовано"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Користувачі"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Ви"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Інші користувачі"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Додати користувача"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Активний"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Неактивний"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Користувачі та профілі"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Додати користувача чи профіль"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Профіль з обмеженням"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Перш ніж створювати обмежений профіль, потрібно налаштувати блокування екрана, щоб захистити свої програми та особисті дані."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Налаштувати блокування"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Не створено"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Не налаштовано – профіль з обмеженням"</string>
     <string name="user_owner" msgid="3879126011135546571">"Власник"</string>
+    <string name="user_you" msgid="1639158809315025986">"Ви (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Псевдонім"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Додавання"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Користувачі мають власні програми та вміст"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Ви можете обмежити доступ до програм і вмісту з вашого облікового запису"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Користувач"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Профіль з обмеженням"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Додати нового користувача"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Щоб користуватися цим пристроєм спільно, потрібно створити додаткових користувачів. Кожен користувач має власну пам’ять, яку може використовувати для зберігання програм, фонових малюнків тощо. Користувачі також можуть налаштовувати певні параметри планшетного ПК, як-от Wi-Fi, які застосовуватимуться до решти користувачів."\n\n"Особа, для якої ви створили нового користувача, має здійснити процес налаштування."\n\n"Будь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Щоб користуватися цим пристроєм спільно, потрібно створити додаткових користувачів. Кожен користувач має власну пам’ять, яку може використовувати для зберігання програм, фонових малюнків тощо. Користувачі також можуть налаштовувати певні параметри планшетного ПК, як-от Wi-Fi, які застосовуватимуться до решти користувачів."\n\n"Особа, для якої ви створили нового користувача, має здійснити процес налаштування."\n\n"Будь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Особа, для якої ви створили нового користувача, має здійснити процес налаштування."\n\n"Будь-який користувач може схвалювати дозволи на оновлення програм від імені інших користувачів."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Створити користувача зараз?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Новий користувач має взяти планшетний ПК та налаштувати свій простір"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Налаштувати профіль зараз?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Створити зараз"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Не зараз"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Лише власник планшетного ПК може керувати користувачами."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Лише власник телефону може керувати користувачами."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Обмежені профілі не можуть додавати облікові записи"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> – видалити з пристрою"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новий користувач"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Новий профіль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Видалити себе?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Видалити користувача?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Вилучити профіль?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Вашу пам’ять і дані буде видалено з цього планшетного ПК. Цю дію не можна відмінити."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Вашу пам’ять і дані буде видалено з цього телефону. Цю дію не можна відмінити."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Пам’ять і дані цього користувача буде видалено з цього планшетного ПК. Цю дію не можна відмінити."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Пам’ять і дані цього користувача буде видалено з цього телефону. Цю дію не можна відмінити."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Пам’ять і дані цього профілю буде видалено з цього планшета. Цю дію не можна відмінити."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Пам’ять і дані цього профілю буде видалено з цього телефону. Цю дію не можна відмінити."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Додавання нового користувача…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Видалити користувача"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Видалити"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"Дозволи для програм і вмісту"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Програми з обмеженнями"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Розгорнути налаштув. програм"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Це налаштування впливає на всіх користувачів цього планшетного ПК."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Це налаштування впливає на всіх користувачів цього телефону."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Змінити мову"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Ідентифікатор фотографії"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Широкомовні повідомлення мережі"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Виберіть типи сповіщень про надзвичайні ситуації, які мають відображатися."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Обмеження для програм і вмісту"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ПЕРЕЙМЕНУВАТИ"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Установити обмеження для програми"</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="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi і мобільні мережі"</string>
+    <string name="restriction_wifi_config_summary" msgid="70888791513065244">"Дозволити вносити зміни в налаштування Wi‑Fi і мобільних мереж"</string>
+    <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дозволити вносити зміни в створення пари та налаштування Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дозволити обмін даними, коли планшетний ПК торкнеться іншого пристрою"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дозволити обмін даними, коли телефон торкнеться іншого пристрою"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Доступ до місцезнаходження"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Дозволити програмам використовувати дані про місцезнаходження"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Далі"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Завершити"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Зробити фото"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Вибрати фото з галереї"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 9ed2783..82ff460 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Chậm"</item>
     <item msgid="1145554631248513562">"Thường"</item>
     <item msgid="7553665153391107454">"Nhanh"</item>
-    <item msgid="2538100882620724753">"Rất nhanh"</item>
+    <item msgid="1370673569131070146">"Nhanh hơn"</item>
+    <item msgid="4648206845228970803">"Rất nhanh"</item>
+    <item msgid="4977949754169483251">"Nhanh"</item>
+    <item msgid="6106302964845503577">"Rất nhanh"</item>
+    <item msgid="6800277205640837264">"Nhanh nhất"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Rất thấp"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Không có"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Không"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"Không xác định"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Không có"</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">"Bộ nhớ trong của thiết bị"</item>
     <item msgid="3738430123799803530">"Thẻ SD tháo lắp được"</item>
     <item msgid="4498124044785815005">"Cho phép hệ thống quyết định"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Vị trí"</item>
+    <item msgid="255608127647030286">"Cá nhân"</item>
+    <item msgid="4588829735729884491">"Nhắn tin"</item>
+    <item msgid="8971765125227378270">"Thiết bị"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"vị trí tổng thể"</item>
+    <item msgid="5789673140227507995">"vị trí chính xác"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"rung"</item>
+    <item msgid="3434165993711230924">"đọc danh sách liên hệ"</item>
+    <item msgid="616161687718081936">"sửa đổi danh sách liên hệ"</item>
+    <item msgid="7638002295329050091">"đọc nhật ký cuộc gọi"</item>
+    <item msgid="6546959730920410907">"sửa đổi nhật ký cuộc gọi"</item>
+    <item msgid="446877710771379667">"đọc lịch"</item>
+    <item msgid="7674458294386319722">"sửa đổi lịch"</item>
+    <item msgid="8281201165558093009">"quét wi-fi"</item>
+    <item msgid="8694611243479480497">"thông báo"</item>
+    <item msgid="7776439107987345446">"quét điện thoại di động"</item>
+    <item msgid="514615766544675057">"gọi điện thoại"</item>
+    <item msgid="8181415497109310680">"đọc SMS"</item>
+    <item msgid="6816551144382117307">"soạn SMS"</item>
+    <item msgid="4600463921908905030">"nhận SMS"</item>
+    <item msgid="5958926493289432745">"nhận SMS khẩn cấp"</item>
+    <item msgid="4945269495221089540">"nhận MMS"</item>
+    <item msgid="5570472453573929087">"nhận WAP push"</item>
+    <item msgid="7125408150230860501">"gửi SMS"</item>
+    <item msgid="7080337936612188061">"đọc ICC SMS"</item>
+    <item msgid="587124103118495063">"soạn ICC SMS"</item>
+    <item msgid="2320577158869025503">"sửa đổi cài đặt"</item>
+    <item msgid="1545733463471924009">"vẽ lên trên"</item>
+    <item msgid="3609046903962454582">"truy cập thông báo"</item>
+    <item msgid="4671646036128214513">"máy ảnh"</item>
+    <item msgid="1097324338692486211">"ghi âm"</item>
+    <item msgid="5031552983987798163">"phát âm thanh"</item>
+    <item msgid="8374996688066472414">"đọc khay nhớ tạm"</item>
+    <item msgid="3045529469061083747">"sửa đổi khay nhớ tạm"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Vị trí"</item>
+    <item msgid="8677040780775113033">"Vị trí"</item>
+    <item msgid="1660743989948992916">"Vị trí"</item>
+    <item msgid="8791172739860195290">"Rung"</item>
+    <item msgid="383413555642128046">"Đọc danh sách liên hệ"</item>
+    <item msgid="3654594895269697313">"Sửa đổi danh sách liên hệ"</item>
+    <item msgid="7928393476362362538">"Đọc nhật ký cuộc gọi"</item>
+    <item msgid="6248591205254641116">"Sửa đổi nhật ký cuộc gọi"</item>
+    <item msgid="6093344633066170692">"Đọc lịch"</item>
+    <item msgid="1334886368750347692">"Sửa đổi lịch"</item>
+    <item msgid="1638204101698708656">"Vị trí"</item>
+    <item msgid="2154671955760380322">"Đăng thông báo"</item>
+    <item msgid="4282477730595931828">"Vị trí"</item>
+    <item msgid="4891423912898525905">"Gọi điện thoại"</item>
+    <item msgid="626463821668200388">"Nhận SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Gửi SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Nhận SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Nhận SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Nhận SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Nhận SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Gửi SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Nhận SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Gửi SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Sửa đổi cài đặt"</item>
+    <item msgid="736541391767350377">"Vẽ lên trên"</item>
+    <item msgid="5530815681721654194">"Truy cập thông báo"</item>
+    <item msgid="781213371706962767">"Máy ảnh"</item>
+    <item msgid="1720492593061838172">"Ghi âm"</item>
+    <item msgid="3493046322001257041">"Phát âm thanh"</item>
+    <item msgid="136815868796597058">"Đọc khay nhớ tạm"</item>
+    <item msgid="5238692940326972503">"Sửa đổi khay nhớ tạm"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Ngắn"</item>
     <item msgid="2560532955514699713">"Trung bình"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (Đồ họa)"</item>
     <item msgid="1340692776955662664">"Chồng lệnh trên glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Tắt"</item>
+    <item msgid="675719912558941285">"Vẽ vùng clip khác hình chữ nhật bằng màu lam"</item>
+    <item msgid="1064373276095698656">"Đánh dấu lệnh vẽ đã kiểm tra bằng màu lục"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Tắt"</item>
+    <item msgid="2751513398307949636">"Trên màn hình dưới dạng thanh"</item>
+    <item msgid="8272260411216018353">"Trên màn hình dưới dạng đường"</item>
+    <item msgid="120512413928262547">"Trong adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Giới hạn tiêu chuẩn"</item>
     <item msgid="4071574792028999443">"Không có quá trình nền"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index ea5eabb..d361b25 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Chế độ trên máy bay"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"Thêm…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Không dây &amp; mạng"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động, &amp; VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động và VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Chuyển vùng dữ liệu"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Kết nối với dịch vụ dữ liệu khi chuyển vùng"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Nhập văn bản để hiển thị trên màn hình khóa"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Hiển thị thông tin người dùng trên màn hình khóa"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Thông tin người dùng"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Thông tin tiểu sử"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Quyền truy cập thông tin vị trí"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Bảo mật"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Quản lý thiết bị"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Quản trị viên thiết bị"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Xem hoặc hủy kích hoạt quản trị viên điện thoại"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bật Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Nhớ cài đặt"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"Hiển thị không dây"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Để xem thiết bị, bật hiển thị không dây."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Hiển thị không dây bị tắt do Wi-Fi tắt."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Hiển thị không dây bị tắt do Wi-Fi bị tắt."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Tìm kiếm hiển thị"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Đang tìm kiếm..."</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Không tìm thấy hiển thị không dây lân cận nào."</string>
@@ -524,50 +535,57 @@
     <string name="android_beam_explained" msgid="6981652347448777459">"Khi tính năng này được bật, bạn có thể truyền nội dung ứng dụng vào thiết bị có khả năng NFC khác bằng cách giữ các thiết bị gần nhau. Ví dụ: bạn có thể truyền các trang Trình duyệt, video trên YouTube, danh sách liên hệ Người và nhiều thứ khác."\n\n"Chỉ cần đưa thiết bị gần nhau (thường quay lưng lại với nhau) rồi chạm vào màn hình của bạn. Ứng dụng xác định nội dung nào được truyền."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Khám phá dịch vụ mạng"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Cho phép ứng dụng trên các thiết bị khác khám phá ứng dụng trên thiết bị này"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Bật Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Cài đặt Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Bật Wi‑Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Cài đặt Wi‑Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Thiết lập &amp; quản lý điểm truy cập mạng"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Chọn Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Đang bật Wi-Fi…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Đang tắt Wi-Fi…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Chọn Wi‑Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Đang bật Wi‑Fi…"</string>
+    <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="3038290727701553612">"Thông báo cho tôi khi mạng mở khả dụ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="2466956369738047669">"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_setting_sleep_policy_title" msgid="9107237003911220057">"Bật Wi-Fi khi ngủ"</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_scan_always_available" msgid="3470564139944368030">"Tùy chọn quét luôn sẵn sàng"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"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_install_credentials" msgid="3551143317298272860">"Cài đặt chứng chỉ"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Để nâng cao độ chính xác và cho các mục đích khác, Google và các ứng dụng khác có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Tùy chọn quét luôn sẵn sàng."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Ứng dụng có thể quét tìm các mạng gần đó, ngay cả khi Wi-Fi bị tắt. Nếu bạn không muốn điều này xảy ra, hãy đi đến Nâng cao &gt; Tùy chọn quét luôn sẵn sàng."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Không hiển thị nữa"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Giữ kết nối Wi-Fi khi ở chế độ ngủ"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Đã xảy ra sự cố khi thay đổi cài đặt"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Tối ưu hóa Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Giảm thiểu sử dụng pin khi Wi-Fi bật"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Tối ưu hóa Wi‑Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Giảm thiểu sử dụng pin khi Wi‑Fi bật"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Thêm mạng"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Mạng Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Mạng Wi‑Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Nút Đẩy WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Tùy chọn khác"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Nhập mã pin WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"Kết nối tới mạng"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Quên mạng"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Để xem các mạng có sẵn, hãy bật Wi-Fi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Đang tìm kiếm mạng Wi-Fi..."</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng khả dụng, hãy bật Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Đang tìm kiếm mạng Wi‑Fi..."</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Bạn không có quyền thay đổi mạng Wi‑Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Mạng khác…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Thêm"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Thiết lập tự động (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Để hoàn tất quá trình thiết lập, máy tính bảng của bạn cần quyền truy cập vào Wi-Fi. Sau khi thiết lập, bạn có thể chuyển giữa dữ liệu di động và Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Để hoàn tất thiết lập, máy tính bảng của bạn cần quyền truy cập Wi-Fi. Sau khi thiết lập, bạn có thể chuyển đổi giữa dữ liệu di động và Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Hiển thị tùy chọn nâng cao"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Thiết lập Wi-Fi được bảo vệ"</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="7204827509934892103">"Nhấn nút Thiết lập Wi-Fi được bảo vệ trên bộ định tuyến của bạn. Quá trình này có thể được gọi là \"WPS\" hoặc chứa ký hiệu sau:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Đã kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</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>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS đã được xử lý và có thể mất tối đa hai phút để hoàn tất"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS không thành công. Vui lòng thử lại sau ít phút."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Cài đặt bảo mật bộ định tuyến không dây (WEP) không được hỗ trợ"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Xác thực không thành công. Vui lòng thử lại."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Đã phát hiện một phiên WPS khác. Vui lòng thử lại sau ít phút."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"SSID Mạng"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Nhập SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Bảo mật"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Cường độ tín hiệu"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Trạng thái"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Cho 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_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Từ chối"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Kết nối"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Không thể kết nối với mạng"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Quên"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Không bỏ qua"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"CẢNH BÁO: Bạn có thể phải trả thêm phí dữ liệu cho nhà cung cấp dịch vụ."\n\n"Thiết lập máy tính bảng có thể yêu cầu hoạt động mạng đáng kể."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"CẢNH BÁO: Bạn có thể phải trả thêm phí dữ liệu cho nhà cung cấp dịch vụ."\n\n"Thiết lập điện thoại có thể yêu cầu hoạt động mạng đáng kể."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"CẢNH BÁO: Máy tính bảng không thể xác minh rằng phần mềm của bạn được cập nhật."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"CẢNH BÁO: Điện thoại không thể xác minh rằng phần mềm của bạn được cập nhật."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Máy tính bảng không thể kết nối với mạng Wi-Fi này."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Điện thoại không thể kết nối với mạng Wi-Fi này."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Wi-Fi nâng cao"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Dải tần số Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"CẢNH BÁO: Máy tính bảng sẽ không thể xác minh rằng phần mềm của bạn đã cập nhật cho đến khi bạn có kết nối internet."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"CẢNH BÁO: Điện thoại sẽ không thể xác minh rằng phần mềm của bạn đã cập nhật cho đến khi bạn có kết nối internet."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Máy tính bảng không thể kết nối với mạng Wi‑Fi này."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Điện thoại không thể kết nối với mạng Wi‑Fi này."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi‑Fi nâng cao"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Dải tần số Wi‑Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Chỉ định dải tần số hoạt động"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Đã xảy ra sự cố khi thiết đặt dải tần số."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Địa chỉ MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Cổng"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Độ dài tiền tố mạng"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Thông tin thiết bị"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Ghi nhớ kết nối này"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Tìm kiếm thiết bị"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hủy lời mời?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Bạn có muốn hủy lời mời kết nối với <xliff:g id="PEER_NAME">%1$s</xliff:g> không?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Bỏ qua nhóm này?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Điểm phát sóng Wi‑Fi di động"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Đang bật điểm phát sóng…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Đang tắt điểm phát sóng…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Điểm phát sóng di động <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hoạt động"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Lỗi điểm phát sóng Wi-Fi di động"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Thiết lập điểm phát sóng Wi-Fi"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> điểm phát sóng Wi-Fi di động"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Lỗi điểm phát sóng Wi‑Fi di động"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Thiết lập điểm phát sóng Wi‑Fi"</string>
+    <string name="wifi_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="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Cường độ tín hiệu"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Chuyển vùng"</string>
     <string name="status_operator" msgid="2274875196954742087">"Mạng"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Địa chỉ MAC của Wi-Fi"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Địa chỉ MAC của Wi‑Fi"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Địa chỉ Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Số sê-ri"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Không rảnh"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Đã bật APN"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"Đã tắt APN"</string>
     <string name="bearer" msgid="594270280031923558">"Trình chuyển"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Kiểu MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Giá trị MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Xóa APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"APN mới"</string>
     <string name="menu_save" msgid="8109345640668285399">"Lưu"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Trợ giúp"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Mạng di động"</string>
     <string name="location_title" msgid="1029961368397484576">"Vị trí của tôi"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Vị trí Wi-Fi và mạng di động"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Vị trí Wi‑Fi và mạng di động"</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="7457348712272184793">"Vị trí được xác định bằng Wi-Fi"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Vị trí được xác định bằng Wi‑Fi"</string>
     <string name="location_gps" msgid="8392461023569708478">"Vệ tinh GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Cho phép ứng dụng sử dụng GPS trên máy tính bảng để xác định vị trí của bạn"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Cho phép ứng dụng sử dụng GPS trên điện thoại để xác định vị trí của bạn"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"Bộ lọc"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Chọn tùy chọn bộ lọc"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Tất cả"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Đã tắt"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Đã tải xuống"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Đang hoạt động"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Bộ nhớ USB"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Nếu bạn tắt ứng dụng được tích hợp sẵn, các ứng dụng khác có thể hoạt động sai. Dữ liệu của bạn cũng sẽ bị xóa."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Tắt thông báo?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Nếu bạn tắt thông báo cho ứng dụng này, bạn có thể bỏ qua cảnh báo và cập nhật quan trọng."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Hoạt động của ứng dụng"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Ðang chạy"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Chưa bao giờ được sử dụng)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Sử dụng bộ nhớ"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Xem dung lượng lưu trữ mà các ứng dụng sử dụng"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Các dịch vụ đang hoạt động"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Từ:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Phím tắt:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Ngôn ngữ:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Nhập một từ"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Phím tắt tùy chọn"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Chỉnh sửa từ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Chỉnh sửa"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Xóa"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Cài đặt bàn phím thực"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Tùy chọn nhà phát triển"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Đặt tùy chọn cho phát triển ứng dụng"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Tùy chọn dành cho nhà phát triển không khả dụng cho người dùng này"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Gỡ lỗi USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Chế độ gỡ lỗi khi USB được kết nối"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Thu hồi ủy quyền gỡ lỗi USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Báo cáo lỗi trong trình đơn nguồn"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Bao gồm tùy chọn trong trình đơn nguồn để thêm báo cáo lỗi"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Không khóa màn hình"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Cho phép cài đặt phát triển?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Những cài đặt này chỉ dành cho mục đích phát triển. Chúng có thể làm cho thiết bị và ứng dụng trên thiết bị của bạn bị lỗi và hoạt động sai."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Xác minh ứng dụng qua USB"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Nút nguồn kết thúc cuộc gọi"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Nói mật khẩu"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Thời gian chờ cho chạm và giữ"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Nâng cao khả năng truy cập web"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Cài đặt"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Bật"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Tắt"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Được phép"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Không được phép"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Cho phép"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Không cho phép"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Sử dụng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> có thể thu thập tất cả văn bản bạn nhập, ngoại trừ mật khẩu, bao gồm dữ liệu cá nhân như số thẻ tín dụng. Dịch vụ này cũng có thể thu thập dữ liệu về tương tác của bạn với máy tính bảng."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> có thể thu thập tất cả văn bản bạn nhập, ngoại trừ mật khẩu, bao gồm dữ liệu cá nhân như số thẻ tín dụng. Dịch vụ này cũng có thể thu thập dữ liệu về tương tác của bạn với điện thoại."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Ngừng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"Chạm vào OK sẽ ngừng <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Theo dõi tác vụ của bạn"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Nhận thông báo khi bạn đang tương tác với một ứng dụng."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Dừng <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Chạm vào OK sẽ ngừng <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Chưa có dịch vụ nào được cài đặt"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Cần trình đọc màn hình?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack cung cấp phản hồi bằng giọng nói nhằm giúp người dùng bị mù và mắt kém. Bạn có muốn cài đặt ứng dụng này miễn phí từ Android Market không?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Bạn có muốn ứng dụng cài đặt tập lệnh từ Google làm cho nội dung web của chúng dễ truy cập hơn?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Không có mô tả nào được cung cấp."</string>
     <string name="settings_button" msgid="3006713718908152930">"Cài đặt"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Pin"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Đang sạc"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Màn hình bật"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS bật"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Không khóa màn hình"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Tín hiệu mạng di động"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Thời gian thức của thiết bị"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Thời gian Wi-Fi bật"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Thời gian Wi-Fi bật"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"Thời gian bật Wi-Fi"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"Thời gian bật Wi‑Fi"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Chi tiết lịch sử"</string>
     <string name="details_title" msgid="3792801565213935385">"Sử dụng các chi tiết"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Điều chỉnh việc sử dụng nguồn"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Gói bao gồm"</string>
     <string name="power_screen" msgid="3023346080675904613">"Màn hình"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Chế độ chờ của điện thoại di động"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Nền trước CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Không khóa màn hình"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi đang chạy"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Đang chạy Wi-Fi"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Máy tính bảng"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Điện thoại"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Dữ liệu đã gửi"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Thông tin về ứng dụng"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Cài đặt ứng dụng"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Cài đặt màn hình"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Cài đặt Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Cài đặt Wi‑Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Cài đặt Bluetooth"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Pin được các cuộc gọi thoại sử dụng"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Pin được sử dụng khi máy tính bảng ở chế độ rảnh"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Chuyển sang chế độ trên máy bay để tiết kiệm pin trong khu vực không có phủ sóng điện thoại di động"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Pin được màn hình và đèn nền sử dụng"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Giảm độ sáng màn hình và/hoặc thời gian chờ khóa màn hình"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Pin được Wi-Fi sử dụng"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Tắt Wi-Fi khi không sử dụng hoặc khi không có Wi-Fi"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Pin được Wi‑Fi sử dụng"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Tắt Wi‑Fi khi không sử dụng hoặc khi không có Wi‑Fi"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Pin do Bluetooth sử dụng"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Tắt Bluetooth khi không sử dụng"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Thử kết nối tới thiết bị Bluetooth khác"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Định cấu hình"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Chọn công cụ khác"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Công cụ tổng hợp tiếng nói này có thể thu thập tất cả nội dụng sẽ được nói, bao gồm dữ liệu cá nhân như mật khẩu và số thẻ tín dụng. Công cụ này xuất phát từ công cụ <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>. Cho phép sử dụng công cụ tổng hợp tiếng nói này?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Ngôn ngữ này yêu cầu phải có kết nối mạng hoạt động để có thể phát âm thanh được chuyển từ văn bản sang giọng nói."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Công cụ"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"Cài đặt <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> đã được bật"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Công cụ ưu tiên"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Chung"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Kiểm soát điện năng"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Đang cập nhật cài đặt Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Đang cập nhật cài đặt Wi‑Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Đang cập nhật cài đặt Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"bật"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"tắt"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"đang bật"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"đang tắt"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Đồng bộ hóa"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Loại lưu trữ"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Dựa trên phần cứng"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Chỉ phần mềm"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"Sao lưu &amp; khôi phục"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dữ liệu cá nhân"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sao lưu dữ liệu của tôi"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"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_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="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Mật khẩu mới và xác nhận không khớp"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Đặt mật khẩu dự phòng không thành công"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Dừng sao lưu mật khẩu Wi-Fi, dấu trang, cài đặt khác và dữ liệu ứng dụng của bạn đồng thời xóa tất cả sao chép trên máy chủ của Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Dừng sao lưu mật khẩu Wi-Fi, dấu trang, các cài đặt khác và dữ liệu ứng dụng của bạn đồng thời xóa tất cả bản sao trên các máy chủ Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Quản lý thiết bị"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Quản trị viên thiết bị"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Hủy kích hoạt"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Thông báo"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Nhạc chuông và rung khi gọi"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Hệ thống"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Thiết lập Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Đang kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Đã kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Thiết lập Wi‑Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Kết nối với mạng Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Đang kết nối với mạng Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Đã kết nối với mạng Wi‑Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Thêm mạng"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Chưa được kết nối"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Thêm mạng"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Đang kết nối…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Đi tới bước tiếp theo"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP không được hỗ trợ."</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Bạn không thể định cấu hình kết nối EAP Wi-Fi trong khi thiết lập. Sau khi thiết lập, bạn có thể thực hiện điều đó trong Cài đặt, trong Không dây &amp; mạng."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Bạn không thể định cấu hình kết nối EAP Wi‑Fi trong khi thiết lập. Sau khi thiết lập, bạn có thể thực hiện điều đó trong Cài đặt &gt; Không dây và mạng."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Kết nối có thể mất vài phút..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục cài đặt."\n\n"Chạm "<b>"Trở lại"</b>" để kết nối mạng Wi-Fi khác."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục thiết lập."\n\n"Chạm "<b>"Quay lại"</b>" để kết nối với mạng Wi‑Fi khác."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Đồng bộ hóa đã được bật"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Đồng bộ hóa đã bị tắt"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Lỗi đồng bộ hóa"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Ứng dụng được gỡ lỗi chờ trình gỡ lỗi đính kèm trước khi thực hiện"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Nhập"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Bản vẽ"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Kết xuất có tăng tốc phần cứng"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Giám sát"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Đã bật chế độ nghiêm ngặt"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Màn hình flash khi ứng dụng thực hiện các hoạt động dài trên chuỗi chính"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Từ tốt nhất đến tồi nhất: lam, lục, đỏ tươi, đỏ"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Vô hiệu hóa các lớp phủ HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Bật dấu vết"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Chọn các dấu vết đã bật"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Hiện không có dấu vết nào được bật"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"<xliff:g id="NUM">%1$d</xliff:g> dấu vết hiện đang được bật"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Tất cả dấu vết hiện đang được bật"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Bật theo dõi OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Hiển thị ranh giới bố cục"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Hiển thị viền đoạn video, lề, v.v.."</string>
@@ -1656,8 +1684,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Bắt buộc sử dụng GPU cho bản vẽ 2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Bắt buộc 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Bật 4x MSAA trong ứng dụng OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Gỡ lỗi hoạt động của clip khác hình chữ nhật"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Kết xuất GPU cấu hình"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Đo thời gian kết xuất trong adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Tỷ lệ hình động của cửa sổ"</string>
     <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>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Giới hạn quá trình nền"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Hiển thị tất cả ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"H.thị h.thoại Ư. dụng ko đáp ứng cho ư.dụng nền"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"S.dụng WebView thử nghiệm"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Ứng dụng sẽ sử dụng WebView (beta) mới nhất"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Sử dụng dữ liệu"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Chu kỳ sử dụng dữ liệu"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Chuyển vùng dữ liệu"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Hạn chế dữ liệu nền"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Sử dụng 4G riêng biệt"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Hiển thị sử dụng Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Hiển thị việc sử dụng Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Hiển thị t.tin sử dụng Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Điểm phát sóng di động"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Tự động đồng bộ hóa dữ liệu"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Đặt giới hạn dữ liệu di động"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Đặt giới hạn dữ liệu 4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Đặt giới hạn dữ liệu 2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Đặt giới hạn dữ liệu Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Đặt giới hạn dữ liệu Wi‑Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Di động"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được máy tính bảng của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Kết nối dữ liệu di động của bạn sẽ bị vô hiệu hóa khi đạt đến giới hạn được chỉ định."\n\n"Vì việc sử dụng dữ liệu được điện thoại của bạn tính và nhà cung cấp dịch vụ của bạn có thể tính mức sử dụng khác nhau, hãy xem xét việc sử dụng giới hạn vừa phải."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Giới hạn dữ liệu nền?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Nếu bạn giới hạn dữ liệu nền, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Nếu bạn giới hạn dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Nếu bạn giới hạn dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Nếu bạn hạn chế dữ liệu nền trên thiết bị di động, một số ứng dụng và dịch vụ sẽ không hoạt động trừ khi bạn kết nối với mạng Wi-Fi."\n\n"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"cảnh báo"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"giới hạn"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Ứng dụng đã xóa"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được máy tính bảng của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: khoảng <xliff:g id="TOTAL">%1$s</xliff:g> đã được sử dụng, giá trị này được điện thoại của bạn đo. Việc tính mức sử dụng dữ liệu của nhà cung cấp dịch vụ của bạn có thể khác nhau."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Điểm phát sóng di động"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Chọn mạng Wi-Fi là điểm phát sóng di động. Ứng dụng có thể bị hạn chế sử dụng các mạng này khi chạy dưới nền. Ứng dụng cũng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống tệp có kích thước lớn."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Chọn mạng Wi‑Fi là điểm phát sóng di động. Ứng dụng có thể bị hạn chế sử dụng các mạng này khi chạy dưới nền. Ứng dụng cũng có thể cảnh báo trước khi sử dụng các mạng này để tải xuống tệp có kích thước lớn."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Mạng di động"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Mạng Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Để chọn điểm phát sóng di động, hãy bật Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Mạng Wi‑Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Để chọn điểm phát sóng di động, hãy bật Wi‑Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Cuộc gọi khẩn cấp"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Quay lại cuộc gọi"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Tên"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Cho phép"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Thực thi"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Người dùng"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Bạn"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Người dùng khác"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Thêm người dùng"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Đang hoạt động"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Không hoạt động"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Người dùng và tiểu sử"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Thêm người dùng hoặc tiểu sử"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Tiểu sử bị hạn chế"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Trước khi bạn có thể tạo tiểu sử bị hạn chế, bạn sẽ cần thiết lập một màn hình khóa để bảo vệ các ứng dụng và dữ liệu cá nhân của bạn."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Thiết lập khóa"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Chưa thiết lập"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Chưa được thiết lập - Tiểu sử bị hạn chế"</string>
     <string name="user_owner" msgid="3879126011135546571">"Chủ sở hữu"</string>
+    <string name="user_you" msgid="1639158809315025986">"Bạn (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Biệt hiệu"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Thêm"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Người dùng có ứng dụng và nội dung riêng của mình"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Bạn có thể hạn chế quyền truy cập vào ứng dụng và nội dung từ tài khoản của bạn"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Người dùng"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Tiểu sử bị hạn chế"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Thêm người dùng mới"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Bạn có thể chia sẻ thiết bị này với những người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng của họ mà họ có thể tùy chỉnh với các ứng dụng, hình nền riêng, v.v.. Người dùng cũng có thể điều chỉnh các cài đặt máy tính bảng ảnh hưởng tới mọi người, chẳng hạn như Wi-Fi."\n\n"Sau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập."\n\n"Bất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Bạn có thể chia sẻ thiết bị này với những người khác bằng cách tạo thêm người dùng. Mỗi người dùng có không gian riêng mà họ có thể tùy chỉnh với các ứng dụng, hình nền riêng, v.v. Người dùng cũng có thể điều chỉnh các cài đặt máy tính bảng ảnh hưởng tới mọi người, chẳng hạn như Wi-Fi."\n\n"Sau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập."\n\n"Bất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Sau khi bạn tạo người dùng mới, người đó cần thực hiện quy trình thiết lập."\n\n"Bất kỳ người dùng nào cũng có thể chấp nhận các quyền của ứng dụng được cập nhật thay mặt tất cả những người dùng khác."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Thiết lập người dùng ngay bây giờ?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Đảm bảo có người để nhận máy tính bảng và thiết lập bộ nhớ của họ"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Thiết lập tiểu sử ngay bây giờ?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Thiết lập ngay bây giờ"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Không phải bây giờ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Chỉ chủ sở hữu máy tính bảng mới có thể quản lý người dùng."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Chỉ chủ sở hữu điện thoại mới có thể quản lý người dùng."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Các tiểu sử bị hạn chế không thể thêm tài khoản"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Xóa <xliff:g id="USER_NAME">%1$s</xliff:g> khỏi thiết bị"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Người dùng mới"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Tiểu sử mới"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Xóa chính bạn?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Xóa người dùng?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Xóa tiểu sử?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Bạn sẽ mất không gian và dữ liệu của mình trên máy tính bảng này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Bạn sẽ mất không gian và dữ liệu của mình trên điện thoại này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Không gian và dữ liệu của người dùng này sẽ biến mất khỏi máy tính bảng này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Không gian và dữ liệu của người dùng này sẽ biến mất khỏi điện thoại này. Bạn không thể hoàn tác tác vụ này."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Không gian và dữ liệu của tiểu sử này sẽ biến mất khỏi máy tính bảng này. Bạn không thể hoàn tác tác vụ này."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Không gian và dữ liệu của tiểu sử này sẽ biến mất khỏi điện thoại này. Bạn không thể hoàn tác tác vụ này."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Đang thêm người dùng mới..."</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Xóa người dùng"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Xóa"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Cài đặt này ảnh hưởng đến tất cả người dùng trên máy tính bảng này."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Cài đặt này ảnh hưởng đến tất cả người dùng trên điện thoại này."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Thay đổi ngôn ngữ"</string>
@@ -1830,4 +1876,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"ID ảnh"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Phát sóng trên di động"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chọn các loại cảnh báo khẩn cấp để hiển thị."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Hạn chế nội dung và ứng dụng"</string>
+    <string name="user_rename" msgid="8523499513614655279">"ĐỔI TÊN"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Đặt giới hạn ứ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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Cho phép sửa đổi cài đặt và ghép nối Bluetooth"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Cho phép trao đổi dữ liệu khi máy tính bảng chạm vào thiết bị khác"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Cho phép trao đổi dữ liệu khi điện thoại chạm vào thiết bị khác"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Quyền truy cập thông tin vị trí"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Cho phép ứng dụng sử dụng thông tin vị trí của bạn"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Quay lại"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Tiếp theo"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Hoàn tất"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Chụp ảnh"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Chọn ảnh từ Thư viện"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 3d38157..723b979 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"慢"</item>
     <item msgid="1145554631248513562">"正常"</item>
     <item msgid="7553665153391107454">"快"</item>
-    <item msgid="2538100882620724753">"很快"</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>
@@ -91,7 +95,7 @@
     <item msgid="1634960474403853625">"已断开连接"</item>
     <item msgid="746097431216080650">"失败"</item>
     <item msgid="6367044185730295334">"已阻止"</item>
-    <item msgid="503942654197908005">"暂时关闭状况不佳的连接"</item>
+    <item msgid="503942654197908005">"暂时关闭（网络状况不佳）"</item>
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
@@ -105,7 +109,7 @@
     <item msgid="197508606402264311">"已断开连接"</item>
     <item msgid="8578370891960825148">"失败"</item>
     <item msgid="5660739516542454527">"已阻止"</item>
-    <item msgid="1805837518286731242">"暂时关闭状况不佳的连接"</item>
+    <item msgid="1805837518286731242">"暂时关闭（网络状况不佳）"</item>
   </string-array>
     <!-- no translation found for wifi_security:0 (8491993170197127709) -->
     <!-- no translation found for wifi_security:1 (6524315248437318854) -->
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"无"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"无"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"未指定"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"无"</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">"设备内存"</item>
     <item msgid="3738430123799803530">"可卸载的 SD 卡"</item>
     <item msgid="4498124044785815005">"由系统确定"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"位置"</item>
+    <item msgid="255608127647030286">"个人"</item>
+    <item msgid="4588829735729884491">"短信"</item>
+    <item msgid="8971765125227378270">"设备"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"粗略位置"</item>
+    <item msgid="5789673140227507995">"精准位置"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"振动"</item>
+    <item msgid="3434165993711230924">"读取联系人"</item>
+    <item msgid="616161687718081936">"修改联系人"</item>
+    <item msgid="7638002295329050091">"读取通话记录"</item>
+    <item msgid="6546959730920410907">"修改通话记录"</item>
+    <item msgid="446877710771379667">"读取日历"</item>
+    <item msgid="7674458294386319722">"修改日历"</item>
+    <item msgid="8281201165558093009">"Wi-Fi 扫描"</item>
+    <item msgid="8694611243479480497">"通知"</item>
+    <item msgid="7776439107987345446">"手机网络扫描"</item>
+    <item msgid="514615766544675057">"拨打电话"</item>
+    <item msgid="8181415497109310680">"读取短信"</item>
+    <item msgid="6816551144382117307">"编写短信"</item>
+    <item msgid="4600463921908905030">"接收短信"</item>
+    <item msgid="5958926493289432745">"接收紧急短信"</item>
+    <item msgid="4945269495221089540">"接收彩信"</item>
+    <item msgid="5570472453573929087">"接收 WAP PUSH 消息"</item>
+    <item msgid="7125408150230860501">"发送短信"</item>
+    <item msgid="7080337936612188061">"读取 ICC 短信"</item>
+    <item msgid="587124103118495063">"写入 ICC 短信"</item>
+    <item msgid="2320577158869025503">"修改设置"</item>
+    <item msgid="1545733463471924009">"在顶部绘制"</item>
+    <item msgid="3609046903962454582">"查看通知"</item>
+    <item msgid="4671646036128214513">"相机"</item>
+    <item msgid="1097324338692486211">"录制音频"</item>
+    <item msgid="5031552983987798163">"播放音频"</item>
+    <item msgid="8374996688066472414">"读取剪贴板内容"</item>
+    <item msgid="3045529469061083747">"修改剪贴板内容"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"振动"</item>
+    <item msgid="383413555642128046">"读取联系人"</item>
+    <item msgid="3654594895269697313">"修改联系人"</item>
+    <item msgid="7928393476362362538">"读取通话记录"</item>
+    <item msgid="6248591205254641116">"修改通话记录"</item>
+    <item msgid="6093344633066170692">"读取日历"</item>
+    <item msgid="1334886368750347692">"修改日历"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"发布通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"拨打电话"</item>
+    <item msgid="626463821668200388">"接收短信/彩信"</item>
+    <item msgid="1237538540368797101">"发送短信/彩信"</item>
+    <item msgid="3986142739951490025">"接收短信/彩信"</item>
+    <item msgid="3984213795861739778">"接收短信/彩信"</item>
+    <item msgid="3656243523752472788">"接收短信/彩信"</item>
+    <item msgid="8105802370238551510">"接收短信/彩信"</item>
+    <item msgid="1407766984645388488">"发送短信/彩信"</item>
+    <item msgid="1530132603376027248">"接收短信/彩信"</item>
+    <item msgid="1188256962149204607">"发送短信/彩信"</item>
+    <item msgid="4218544235221631789">"修改设置"</item>
+    <item msgid="736541391767350377">"在顶部绘制"</item>
+    <item msgid="5530815681721654194">"查看通知"</item>
+    <item msgid="781213371706962767">"相机"</item>
+    <item msgid="1720492593061838172">"录制音频"</item>
+    <item msgid="3493046322001257041">"播放音频"</item>
+    <item msgid="136815868796597058">"读取剪贴板内容"</item>
+    <item msgid="5238692940326972503">"修改剪贴板内容"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace（图形）"</item>
     <item msgid="1340692776955662664">"glGetError 上的调用堆栈"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"在屏幕上显示为条形图"</item>
+    <item msgid="8272260411216018353">"在屏幕上显示为线型图"</item>
+    <item msgid="120512413928262547">"在 adb shell dumpsys gfxinfo 中"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"标准限制"</item>
     <item msgid="4071574792028999443">"不允许后台进程"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 4478f15..c8e50bd 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -228,7 +228,7 @@
     <string name="radio_info_toggle_dns_check_label" msgid="8292252930563286858">"切换 DNS 检查"</string>
     <string name="oem_radio_info_label" msgid="6163141792477958941">"特定 OEM 的信息/设置"</string>
     <string name="band_mode_title" msgid="954174198903776205">"设置 GSM/UMTS 波段"</string>
-    <string name="band_mode_loading" msgid="548764766363847336">"正在载入波段列表..."</string>
+    <string name="band_mode_loading" msgid="548764766363847336">"正在加载波段列表..."</string>
     <string name="band_mode_set" msgid="5730560180249458484">"设置"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"失败"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"成功"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"更多..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"无线和网络"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、蓝牙、飞行模式、移动网络和 VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"管理 WLAN、蓝牙、飞行模式、移动网络和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"移动数据网络漫游"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫游时连接到移动数据网络服务"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"漫游时连接到移动数据网络服务"</string>
@@ -284,11 +284,11 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"设置日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"设置日期、时间、时区和格式"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"自动确定日期和时间"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用网络上的时间"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"使用网络上的时间"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用网络提供的时间"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"使用网络提供的时间"</string>
     <string name="zone_auto" msgid="334783869352026648">"自动确定时区"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用网络上的时区"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用网络上的时区"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"使用网络提供的时区"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"使用网络提供的时区"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"使用 24 小时格式"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"设置时间"</string>
     <string name="date_time_set_timezone" msgid="5045627174274377814">"选择时区"</string>
@@ -309,7 +309,9 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"输入要在锁定屏幕上显示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在锁定屏幕上显示用户信息"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"用户信息"</string>
-    <string name="location_settings_title" msgid="4483843407328665068">"位置信息访问权限"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在锁定屏幕上显示个人资料信息"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
+    <string name="location_settings_title" msgid="4483843407328665068">"位置信息使用权"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"设备管理"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"设备管理器"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用设备管理器"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"通知读取权限"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"打开蓝牙"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"蓝牙"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"记住设置"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"无线显示"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"要查看设备，请打开无线显示功能。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"由于 Wi-Fi 已关闭，因此无线显示功能已停用。"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"由于 WLAN 已关闭，因此无线显示功能已停用。"</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"搜索显示设备"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"正在搜索…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"找不到附近有无线显示设备。"</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"打开 Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 设置"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WLAN"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"打开 WLAN"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"WLAN"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"WLAN 设置"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"设置和管理无线接入点"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"选择 Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"正在打开 Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"正在关闭 Wi-Fi..."</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"选择 WLAN"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"正在打开 WLAN…"</string>
+    <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="3038290727701553612">"附近有开放网络时通知我"</string>
-    <string name="wifi_poor_network_detection" msgid="4925789238170207169">"不采用状况不佳的连接"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"仅在 Wi-Fi 互联网连接状况良好时使用 Wi-Fi 网络"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"在休眠状态下保持 Wi-Fi 连接"</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_scan_always_available" msgid="3470564139944368030">"随时都可扫描"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"即使在 WLAN 关闭时，也允许 Google 的位置服务和其他应用扫描网络"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"安装证书"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"为了提高位置信息精确度以及其他目的，Google 和其他应用可扫描附近的网络（在关闭了 WLAN 时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"应用可扫描附近的网络（在关闭了 WLAN 时也可进行扫描）。如果您不希望应用这么做，请进入“高级”&gt;“随时都可扫描”进行设置。"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不再显示"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"在休眠状态下保持 WLAN 网络连接"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"更改设置时出现问题"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi 优化"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"开启 Wi-Fi 时尽可能节约电池用量"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"WLAN 优化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"开启 WLAN 时尽可能节约电池用量"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"添加网络"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 网络"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"WLAN 网络"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按钮"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多选项"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN 输入"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"Wi-Fi Direct"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"WLAN Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"扫描"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"高级"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"连接到网络"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"取消保存网络"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"要查看可用网络，请打开 Wi-Fi。"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"正在搜索 Wi-Fi 网络…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"要查看可用网络，请打开 WLAN。"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜索 WLAN 网络…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"您无权更改 WLAN 网络。"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"其他网络…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自动设置 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"要完成设置，您的平板电脑需要访问 Wi-Fi 网络。设置完毕后，您将可以在移动数据网络和 Wi-Fi 网络之间切换。"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"为完成设置，您的平板电脑需要使用 WLAN 网络。设置完毕后，您将可以在移动数据网络和 WLAN 网络之间切换。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"显示高级选项"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi 保护设置"</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="7204827509934892103">"请按下您路由器上的 Wi-Fi 保护设置按钮，它可能会标为“WPS”或包含此符号："</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"请在 Wi-Fi 路由器上输入 PIN <xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间才能完成。"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"请按下您路由器上的 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="5754399645462924103">"已连接到 Wi-Fi 网络 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"已连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"正在设置 WPS，此过程最多可能需要两分钟时间才能完成。"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 未能成功启动。请过几分钟后重试。"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"无线路由器安全设置 (WEP) 不受支持"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"身份验证失败。请重试。"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"检测到其他 WPS 会话。请过几分钟后重试。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"网络 SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"输入 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"信号强度"</string>
     <string name="wifi_status" msgid="4824568012414605414">"状态信息"</string>
@@ -593,7 +612,7 @@
     <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="3111321240793227690">"已停用状况不佳的互联网连接"</string>
+    <string name="wifi_disabled_network_failure" msgid="3111321240793227690">"已停用（互联网连接状况不佳）"</string>
     <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"身份验证出现问题"</string>
     <string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
     <string name="wifi_wps_available_first_item" msgid="4422547079984583502">"可使用 WPS"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</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_confirm_allow" msgid="5355973075896817232">"允许"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒绝"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"连接"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"无法连接网络"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"取消保存"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"不要跳过"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需要额外支付运营商数据费。"\n\n"平板电脑设置过程可能会消耗大量网络流量。"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需要额外支付运营商数据费。"\n\n"手机设置过程可能会消耗大量网络流量。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：平板电脑无法验证您的软件是否是最新版本。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：手机无法验证您的软件是否是最新版本。"</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"平板电脑无法连接到此 Wi-Fi 网络。"</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"手机无法连接到此 Wi-Fi 网络。"</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"高级 Wi-Fi 设置"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 频带"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：您必须连接到互联网，平板电脑才能验证您所使用的软件是否为最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告：您必须连接到互联网，手机才能验证您所使用的软件是否为最新版本。"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"平板电脑无法连接到此 WLAN 网络。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"手机无法连接到此 WLAN 网络。"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"高级 WLAN"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"WLAN 频带"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定操作的频率范围"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"设置频带时出现问题。"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 地址"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"域名 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"网络前缀长度"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"WLAN Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"设备信息"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"记住该连接"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜索设备"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"取消保存此群组？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"便携式 WLAN 热点"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"便携式热点 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已启用"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"便携式 Wi-Fi 热点错误"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"设置 Wi-Fi 热点"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"便携式 WLAN 热点错误"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"设置 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="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"信号强度"</string>
     <string name="status_roaming" msgid="2638800467430913403">"漫游"</string>
     <string name="status_operator" msgid="2274875196954742087">"网络"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 地址"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"WLAN MAC 地址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"蓝牙地址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序列号"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"不可用"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 已启用"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 已停用"</string>
     <string name="bearer" msgid="594270280031923558">"承载系统"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO 类型"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO 值"</string>
     <string name="menu_delete" msgid="6981294422841124659">"删除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新建 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"保存"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"帮助"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"移动网络"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"Wi-Fi 和移动网络位置信息"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"WLAN 和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允许应用使用 Google 位置服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给 Google。"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"通过 Wi-Fi 确定位置"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"通过 WLAN 确定位置"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS 卫星定位"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"允许应用使用您平板电脑上的 GPS 定位您的位置"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"允许应用使用您手机上的 GPS 定位您的位置"</string>
@@ -966,7 +990,7 @@
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用服务器来辅助 GPS（取消选中可提高 GPS 性能）"</string>
     <string name="use_location_title" msgid="5206937465504979977">"位置和 Google 搜索"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"允许 Google 使用您的位置信息改善搜索结果和其他服务"</string>
-    <string name="location_access_title" msgid="7064108942964081243">"允许访问我的位置信息"</string>
+    <string name="location_access_title" msgid="7064108942964081243">"允许使用我的位置信息"</string>
     <string name="location_access_summary" msgid="69031404093194341">"允许得到您许可的应用使用您的位置信息"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"位置信息来源"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"关于平板电脑"</string>
@@ -979,12 +1003,12 @@
     <string name="license_title" msgid="1990487604356037871">"许可"</string>
     <string name="terms_title" msgid="7697580845616764642">"条款"</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_license_activity_unavailable" msgid="4210539215951487627">"加载许可时出现问题。"</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"正在加载..."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全信息"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全信息"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="232523852222964470">"您没有数据连接。要立即查看此信息，请通过已联网的任意计算机访问 %s。"</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在载入..."</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"正在加载..."</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"选择您的密码"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"选择您的图案"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"选择您的 PIN"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"过滤"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"选择过滤选项"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"已停用"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下载"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"正在运行"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 存储设备"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"如果您停用内置应用，其他应用可能无法运行。您的数据也将会删除。"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"要关闭通知吗？"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果关闭此应用的通知，您可能会错过重要提醒和最新动态信息。"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"应用操作"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"正在运行"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"（从未使用）"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"存储空间使用情况"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看应用使用的存储空间"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
@@ -1192,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"物理键盘设置"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空格键两次可插入句号"</string>
     <string name="show_password" msgid="3001113966880559611">"显示密码"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"此输入法可能会收集您输入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>”。要使用此输入法吗？"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"此输入法可能会收集您输入的所有内容，包括密码和信用卡号等个人数据。它来自“<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>”应用。要使用此输入法吗？"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"此拼写检查工具可能会收集您键入的所有文字，包括密码和信用卡号等个人数据。它源自应用“<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>”。要使用此拼写检查工具吗？"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"设置"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"语言"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"字词："</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"快捷键："</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"语言："</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"输入字词"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"快捷键（选填）"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"编辑字词"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"编辑"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"删除"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"物理键盘设置"</string>
     <string name="development_settings_title" msgid="215179176067683667">"开发者选项"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"设置应用开发选项"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"此用户无法使用开发者选项"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"撤消 USB 调试授权"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"电源键菜单错误报告"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在电源键菜单中添加提交错误报告的选项"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"不锁定屏幕"</string>
@@ -1270,18 +1302,19 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"允许开发设置？"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"这些设置仅适用于开发工作。一旦启用，会导致您的设备以及设备上的应用崩溃或出现异常。"</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"通过 USB 验证应用"</string>
     <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"通过 ADB/ADT 检查安装的应用是否存在有害行为。"</string>
     <string name="enforce_read_external_title" product="nosdcard" msgid="7733257271454664956">"对 USB 存储设备进行读写保护"</string>
-    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"应用必须请求读取 USB 存储设备的权限"</string>
+    <string name="enforce_read_external_summary" product="nosdcard" msgid="1798088409346660567">"应用必须申请读取 USB 存储设备的权限"</string>
     <string name="enforce_read_external_confirm_title" product="nosdcard" msgid="2112813067171502209">"要对 USB 存储设备进行读写保护吗？"</string>
-    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果 USB 存储设备受到读写保护，则应用必须请求相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_confirm_message" product="nosdcard" msgid="605444326545922054">"如果 USB 存储设备受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
     <string name="enforce_read_external_title" product="default" msgid="2226662853797940829">"对 SD 卡进行读写保护"</string>
-    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须请求读取 SD 卡的权限"</string>
+    <string name="enforce_read_external_summary" product="default" msgid="2750027486786530064">"应用必须申请读取 SD 卡的权限"</string>
     <string name="enforce_read_external_confirm_title" product="default" msgid="273220585729800783">"要对 SD 卡进行读写保护吗？"</string>
-    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须请求相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
+    <string name="enforce_read_external_confirm_message" product="default" msgid="3858482712337574407">"如果 SD 卡受到读写保护，则应用必须申请相关权限才能读取外部存储设备中的数据。"\n\n"某些应用需要其开发者更新之后才能正常使用。"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"选择小工具"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"选择小部件"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"是否允许该应用创建并访问小部件？"</string>
@@ -1314,23 +1347,18 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"按电源按钮结束通话"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"说出密码"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"触摸和按住延迟"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"增强网页辅助功能"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"设置"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"开启"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"关闭"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允许"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允许"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允许"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"不允许"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"要使用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>会收集您键入的所有文字信息（密码除外），其中包括信用卡号等个人数据。它还会收集关于您与平板电脑互动情况的数据。"</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>会收集您键入的所有文字信息（密码除外），其中包括信用卡号等个人数据。它还会收集关于您与手机互动情况的数据。"</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"要停用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"触摸“确定”会停用<xliff:g id="SERVICE">%1$s</xliff:g>。"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"监测您的操作"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"在您与应用互动时接收通知。"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"要停用<xliff:g id="SERVICE">%1$s</xliff:g>吗？"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"触摸“确定”将会停用<xliff:g id="SERVICE">%1$s</xliff:g>。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安装任何服务"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要屏幕阅读器吗？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"“话语提示”可提供语音反馈以帮助盲人和有视力障碍的用户。您要通过 Play 商店免费安装该服务吗？"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允许应用安装来自 Google 的脚本，以便于您浏览这些应用的网页内容吗？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"没有提供说明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"设置"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"电池"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"正在充电"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"屏幕已开启"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS 已启用"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"WLAN"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"唤醒"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"移动网络信号"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"Wi-Fi 开启时间"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"Wi-Fi 开启时间"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"WLAN 开启时间"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN 开启时间"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"历史记录详细信息"</string>
     <string name="details_title" msgid="3792801565213935385">"使用详情"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"调配电量"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"包括的软件包"</string>
     <string name="power_screen" msgid="3023346080675904613">"屏幕"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"蓝牙"</string>
     <string name="power_cell" msgid="6596471490976003056">"手机待机"</string>
     <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
@@ -1369,7 +1397,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU（前台）"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持唤醒状态"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi 正在运行"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"WLAN 正在运行"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板电脑"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"通话"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"数据已发送"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"应用信息"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"应用设置"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"屏幕设置"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 设置"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"WLAN 设置"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"蓝牙设置"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"语音通话所耗的电量"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"平板电脑待机时所耗电量"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"不在信号覆盖范围内时切换到飞行模式，以节约电量"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"显示屏和背光所耗的电量"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"降低屏幕亮度，并且/或者缩短屏幕超时时间"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi 所耗的电量"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"不使用或无法使用 Wi-Fi 时将其关闭"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"WLAN 耗电量"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"未使用或无法使用 WLAN 网络时关闭 WLAN"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"蓝牙所耗的电量"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"请在不使用蓝牙功能时将其关闭"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"尝试连接另一蓝牙设备"</string>
@@ -1430,14 +1458,15 @@
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"设置文字转语音功能要使用的语言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"收听示例"</string>
     <string name="tts_play_example_summary" msgid="8029071615047894486">"播放简短的语音合成示例"</string>
-    <string name="tts_install_data_title" msgid="4264378440508149986">"安装语音数据"</string>
-    <string name="tts_install_data_summary" msgid="5742135732511822589">"安装语音合成所需的语音数据"</string>
+    <string name="tts_install_data_title" msgid="4264378440508149986">"安装语音数据包"</string>
+    <string name="tts_install_data_summary" msgid="5742135732511822589">"安装语音合成所需的数据包"</string>
     <string name="tts_data_installed_summary" msgid="9162111552859972809">"语音合成所需的语音已安装妥当"</string>
     <string name="tts_settings_changed_demo" msgid="4926518555912328645">"设置已发生变化。这是声音效果示例。"</string>
     <string name="tts_engine_error" msgid="3305141107104670703">"您选择的引擎无法运行。"</string>
     <string name="tts_engine_error_config" msgid="5820525416624637313">"配置"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"选择其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此语音合成引擎能够收集语音中出现的所有信息，包括密码和信用卡号码之类的个人数据。此功能由 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> 引擎提供。是否启用此语音合成引擎？"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"您必须连接到网络才能使用文字转语音功能输出这种语言。"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>设置"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已启用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"首选引擎"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"常规"</string>
     <string name="gadget_title" msgid="5519037532720577836">"电量控制"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 设置"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"正在更新 WLAN 设置"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新蓝牙设置"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g><xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"开启"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"关闭"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"正在开启"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"正在关闭"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"WLAN"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"蓝牙"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"同步"</string>
@@ -1481,6 +1510,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"存储类型"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"支持硬件"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"仅限软件"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1502,7 +1534,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"备份和还原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"个人数据"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"备份我的数据"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"将应用数据、Wi-Fi 密码和其他设置备份到 Google 服务器"</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="auto_restore_title" msgid="5397528966329126506">"自动还原"</string>
@@ -1514,7 +1546,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"新密码和确认密码不一致"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"设置备份密码失败"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"要停止备份您的 Wi-Fi 密码、书签、其他设置以及应用数据，并清除 Google 服务器上的所有副本吗？"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"要停止备份您的 WLAN 密码、书签、其他设置和应用数据，并清除 Google 服务器上的所有副本吗？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"设备管理设置"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"设备管理器"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"取消激活"</string>
@@ -1530,10 +1562,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"来电铃声和振动"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"系统"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi 设置"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"连接到 Wi-Fi 网络<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"正在连接到 Wi-Fi 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"已连接到 Wi-Fi 网络<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"WLAN 设置"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"正在连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"已连接到 WLAN 网络“<xliff:g id="NETWORK_NAME">%s</xliff:g>”"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"添加网络"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"未连接"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"添加网络"</string>
@@ -1555,9 +1587,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"正在连接..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"转至下一步"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"不支持 EAP。"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"您无法在设置过程中配置 EAP Wi-Fi 连接。设置完毕后，您可以在“设置”&gt;“无线和网络”中进行配置。"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"您无法在设置过程中配置 EAP WLAN 连接。设置完毕后，您可以在“设置”&gt;“无线和网络”中进行配置。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"建立连接可能需要几分钟时间..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"触摸"<b>"下一步"</b>"可继续进行设置。"\n\n"触摸"<b>"返回"</b>"可连接到其他 Wi-Fi 网络。"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"触摸"<b>"下一步"</b>"可继续进行设置。"\n\n"触摸"<b>"返回"</b>"可连接到其他 WLAN 网络。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步功能已启用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步功能已停用"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步错误。"</string>
@@ -1625,6 +1657,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"调试应用会在执行前等待附加调试器"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"输入"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"绘图"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"硬件加速渲染"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"监控"</string>
     <string name="strict_mode" msgid="1938795874357830695">"启用严格模式"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"应用在主线程上执行长时间操作时闪烁屏幕"</string>
@@ -1642,11 +1675,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"从最优到最差：蓝、绿、淡红、红"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"启用跟踪"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"选择要启用的跟踪"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"当前未启用任何跟踪"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"当前已启用 <xliff:g id="NUM">%1$d</xliff:g> 项跟踪"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"当前已启用所有跟踪"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"启用 OpenGL 跟踪"</string>
     <string name="debug_layout" msgid="5981361776594526155">"显示布局边界"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>
@@ -1656,11 +1684,11 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"强制使用 GPU 进行 2D 绘图"</string>
     <string name="force_msaa" msgid="7920323238677284387">"强制启用 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"在 OpenGL ES 2.0 应用中启用 4x MSAA"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"调试非矩形剪裁操作"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"GPU 呈现模式分析"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"计算 adb shell dumpsys gfxinfo 中的呈现时间"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"窗口动画缩放"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"过渡动画缩放"</string>
-    <string name="animator_duration_scale_title" msgid="3406722410819934083">"动画程序时长调整"</string>
+    <string name="animator_duration_scale_title" msgid="3406722410819934083">"动画程序时长缩放"</string>
     <string name="overlay_display_devices_title" msgid="5364176287998398539">"模拟辅助显示设备"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"应用"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"不保留活动"</string>
@@ -1668,12 +1696,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"后台进程限制"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"显示所有“应用无响应”(ANR)"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"为后台应用显示“应用无响应”对话框"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"使用实验性 WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"应用将使用最新的（测试版）WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"流量使用情况"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"流量使用周期"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"移动数据网络漫游"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制后台数据"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制后台流量"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"单独显示 4G 流量"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"显示 Wi-Fi 使用情况"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"显示 WLAN 使用情况"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"显示以太网使用情况"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"移动热点"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"自动同步数据"</string>
@@ -1687,8 +1717,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"设置移动数据流量限制"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"设置 4G 数据流量限制"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"设置 2G-3G 数据流量限制"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"设置 Wi-Fi 数据流量限制"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"设置 WLAN 数据流量上限"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"WLAN"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"以太网"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"移动"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1719,9 +1749,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的平板电脑计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"达到指定的数据流量上限时，系统会停用您的移动数据连接。"\n\n"由于数据流量是由您的手机计算得出的，您的运营商对于流量的计算方法可能有所不同，因此请考虑设置一个较低的上限。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制后台数据？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果限制后台移动数据，那么除非您已连接到 Wi-Fi 网络，否则部分应用和服务会无法运行。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"如果您限制后台移动数据，则在未连接到 Wi-Fi 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这台平板电脑上的所有用户。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"如果您限制后台移动数据，则在未连接到 Wi-Fi 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这部手机上的所有用户。"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这台平板电脑上的所有用户。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"如果您限制在后台使用移动数据网络，则在未连接到 WLAN 网络时，部分应用和服务将会无法运行。"\n\n"此设置会影响这部手机上的所有用户。"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"已删除的应用"</string>
@@ -1731,10 +1761,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>，由您的平板电脑计算得出。您的运营商对于流量的计算方法可能有所不同。"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用约 <xliff:g id="TOTAL">%1$s</xliff:g>，由您的手机计算得出。您的运营商对于流量的计算方法可能有所不同。"</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"移动热点"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"选择属于移动热点的 Wi-Fi 网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大的文件时，还可能会发出警告。"</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"选择属于移动热点的 WLAN 网络。这样可限制应用在后台使用这些网络。应用在使用这些网络下载较大的文件时，还可能会发出警告。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"移动网络"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Wi-Fi 网络"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"要选择移动热点，请打开 Wi-Fi。"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"WLAN 网络"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"要选择移动热点，请打开 WLAN。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"紧急呼救"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通话"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名称"</string>
@@ -1792,34 +1822,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"许可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"执行中"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"您"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"其他用户"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"活动"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"非活动"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"添加用户或个人资料"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"受限个人资料"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"您需要先设置锁定屏幕来保护您的应用和个人数据，然后才可以创建受限个人资料。"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"设置锁定屏幕"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"未设置"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"未设置 - 受限个人资料"</string>
     <string name="user_owner" msgid="3879126011135546571">"机主"</string>
+    <string name="user_you" msgid="1639158809315025986">"您（<xliff:g id="NAME">%s</xliff:g>）"</string>
     <string name="user_nickname" msgid="5148818000228994488">"昵称"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"添加"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"用户拥有个人专属的应用和内容"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"您可以限制其他人使用来自您的帐户的应用和内容"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"用户"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"受限个人资料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"添加新用户"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整 Wi-Fi 等会影响到所有用户的平板电脑设置。"\n\n"您创建新用户后，该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以通过创建新用户来与其他人共享此设备。每个用户都会有自己的空间，其中可以容纳他们自己的应用、壁纸等内容。用户可以调整 WLAN 等会影响到所有用户的平板电脑设置。"\n\n"您创建新用户后，该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"您创建新用户后，该用户必须完成设置流程。"\n\n"任何用户均可代表其他所有用户接受应用的新权限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"是否立即设置用户？"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"请让这个人拿过平板电脑，让其设置自己的空间。"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"要立即设置个人资料吗？"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"立即设置"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"以后再说"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"只有平板电脑的拥有者可以管理用户。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"只有手机的机主可以管理用户。"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐户"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新用户"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"新的个人资料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"是否删除自己？"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"是否删除用户？"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"要删除个人资料吗？"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您将丢失自己在这台平板电脑上的空间和数据，此操作无法撤消。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您将丢失自己在这部手机上的空间和数据，此操作无法撤消。"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"该用户在这台平板电脑上的空间和数据将会消失，此操作无法撤消。"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"该用户在这部手机上的空间和数据将会消失，此操作无法撤消。"</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"此个人资料在这台平板电脑上的空间和数据将会消失，此操作无法撤消。"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"此个人资料在这部手机上的空间和数据将会消失，此操作无法撤消。"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在添加新用户…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"删除用户"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"删除"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"允许应用和内容"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限应用"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展开应用设置"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"此设置会影响这台平板电脑上的所有用户。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"此设置会影响这部手机上的所有用户。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"更改语言"</string>
@@ -1829,5 +1875,26 @@
     <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"小区广播"</string>
-    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"请选择要显示的紧急消息类型。"</string>
+    <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"选择要显示的紧急消息类型。"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"应用和内容限制"</string>
+    <string name="user_rename" msgid="8523499513614655279">"重命名"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"设置应用限制"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"允许修改蓝牙配对和设置"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"允许在平板电脑与其他设备触碰时交换数据"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"允许在手机与其他设备触碰时交换数据"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"位置信息使用权"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"允许应用使用您的位置信息"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"返回"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"下一步"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"完成"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"拍照"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"从图库中选择照片"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 8fb20b6..a7f70da 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"慢"</item>
     <item msgid="1145554631248513562">"適中"</item>
     <item msgid="7553665153391107454">"快"</item>
-    <item msgid="2538100882620724753">"非常快"</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>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"無"</item>
+    <item msgid="937786527870979616">"MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"無"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"未指定"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"無"</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">"內部裝置儲存空間"</item>
     <item msgid="3738430123799803530">"卸除式 SD 卡"</item>
     <item msgid="4498124044785815005">"讓系統決定"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"位置"</item>
+    <item msgid="255608127647030286">"個人"</item>
+    <item msgid="4588829735729884491">"簡訊"</item>
+    <item msgid="8971765125227378270">"裝置"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"約略位置"</item>
+    <item msgid="5789673140227507995">"精確位置"</item>
+    <item msgid="1061584358377390581">"GPS"</item>
+    <item msgid="5387405117297558954">"震動"</item>
+    <item msgid="3434165993711230924">"讀取聯絡人資料"</item>
+    <item msgid="616161687718081936">"修改聯絡人資料"</item>
+    <item msgid="7638002295329050091">"讀取通話紀錄"</item>
+    <item msgid="6546959730920410907">"修改通話紀錄"</item>
+    <item msgid="446877710771379667">"讀取日曆"</item>
+    <item msgid="7674458294386319722">"修改日曆"</item>
+    <item msgid="8281201165558093009">"Wi-Fi 掃描"</item>
+    <item msgid="8694611243479480497">"通知"</item>
+    <item msgid="7776439107987345446">"手機掃描"</item>
+    <item msgid="514615766544675057">"撥打電話"</item>
+    <item msgid="8181415497109310680">"讀取 SMS"</item>
+    <item msgid="6816551144382117307">"撰寫 SMS"</item>
+    <item msgid="4600463921908905030">"接收 SMS"</item>
+    <item msgid="5958926493289432745">"接收緊急 SMS"</item>
+    <item msgid="4945269495221089540">"接收 MMS"</item>
+    <item msgid="5570472453573929087">"接收 WAP PUSH 簡訊"</item>
+    <item msgid="7125408150230860501">"傳送 SMS"</item>
+    <item msgid="7080337936612188061">"讀取 ICC SMS"</item>
+    <item msgid="587124103118495063">"撰寫 ICC SMS"</item>
+    <item msgid="2320577158869025503">"修改設定"</item>
+    <item msgid="1545733463471924009">"在最上層繪圖"</item>
+    <item msgid="3609046903962454582">"存取通知"</item>
+    <item msgid="4671646036128214513">"相機"</item>
+    <item msgid="1097324338692486211">"錄音"</item>
+    <item msgid="5031552983987798163">"播放音訊"</item>
+    <item msgid="8374996688066472414">"讀取剪貼簿"</item>
+    <item msgid="3045529469061083747">"修改剪貼簿"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"位置"</item>
+    <item msgid="8677040780775113033">"位置"</item>
+    <item msgid="1660743989948992916">"位置"</item>
+    <item msgid="8791172739860195290">"震動"</item>
+    <item msgid="383413555642128046">"讀取聯絡人資料"</item>
+    <item msgid="3654594895269697313">"修改聯絡人資料"</item>
+    <item msgid="7928393476362362538">"讀取通話紀錄"</item>
+    <item msgid="6248591205254641116">"修改通話紀錄"</item>
+    <item msgid="6093344633066170692">"讀取日曆"</item>
+    <item msgid="1334886368750347692">"修改日曆"</item>
+    <item msgid="1638204101698708656">"位置"</item>
+    <item msgid="2154671955760380322">"發佈通知"</item>
+    <item msgid="4282477730595931828">"位置"</item>
+    <item msgid="4891423912898525905">"撥打電話"</item>
+    <item msgid="626463821668200388">"接收 SMS/MMS"</item>
+    <item msgid="1237538540368797101">"傳送 SMS/MMS"</item>
+    <item msgid="3986142739951490025">"接收 SMS/MMS"</item>
+    <item msgid="3984213795861739778">"接收 SMS/MMS"</item>
+    <item msgid="3656243523752472788">"接收 SMS/MMS"</item>
+    <item msgid="8105802370238551510">"接收 SMS/MMS"</item>
+    <item msgid="1407766984645388488">"傳送 SMS/MMS"</item>
+    <item msgid="1530132603376027248">"接收 SMS/MMS"</item>
+    <item msgid="1188256962149204607">"傳送 SMS/MMS"</item>
+    <item msgid="4218544235221631789">"修改設定"</item>
+    <item msgid="736541391767350377">"在最上層繪圖"</item>
+    <item msgid="5530815681721654194">"存取通知"</item>
+    <item msgid="781213371706962767">"相機"</item>
+    <item msgid="1720492593061838172">"錄音"</item>
+    <item msgid="3493046322001257041">"播放音訊"</item>
+    <item msgid="136815868796597058">"讀取剪貼簿"</item>
+    <item msgid="5238692940326972503">"修改剪貼簿"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"短"</item>
     <item msgid="2560532955514699713">"中"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"Systrace (圖片)"</item>
     <item msgid="1340692776955662664">"glGetError 的呼叫堆疊"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <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="2751513398307949636">"在螢幕上以列顯示"</item>
+    <item msgid="8272260411216018353">"在螢幕上以行顯示"</item>
+    <item msgid="120512413928262547">"在「In adb shell dumpsys gfxinfo」指令中"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"標準限制"</item>
     <item msgid="4071574792028999443">"不執行背景處理程序"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index cec4e1d..a524e1d 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -164,7 +164,7 @@
     <string name="bluetooth_connection_notif_message" msgid="3687933246423942977">"輕觸即可連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
     <string name="bluetooth_phonebook_request" msgid="457033227379858269">"電話簿要求"</string>
-    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s 想存取您的通訊錄和通話記錄。要將存取權授予 %2$s 嗎？"</string>
+    <string name="bluetooth_pb_acceptance_dialog_text" msgid="6555508756987053866">"%1$s 想存取您的通訊錄和通話紀錄。要將存取權授予 %2$s 嗎？"</string>
     <string name="bluetooth_pb_remember_choice" msgid="2901499974259177202">"不要再詢問"</string>
     <string name="date_and_time" msgid="4114084177056654663">"日期與時間設定"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
@@ -238,8 +238,8 @@
     <string name="sdcard_settings_not_present_status" product="nosdcard" msgid="1636218515775929394">"未掛接 USB 儲存裝置。"</string>
     <string name="sdcard_settings_not_present_status" product="default" msgid="2048419626134861599">"沒有 SD 卡。"</string>
     <string name="sdcard_settings_available_bytes_label" msgid="763232429899373001">"可用容量 (bytes)："</string>
-    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB 儲存裝置目前作為大量儲存裝置使用。"</string>
-    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD 卡目前作為大量儲存裝置使用。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="nosdcard" msgid="7993410985895217054">"USB 儲存裝置目前做為大量儲存裝置使用。"</string>
+    <string name="sdcard_settings_mass_storage_status" product="default" msgid="2742075324087038036">"SD 卡目前做為大量儲存裝置使用。"</string>
     <string name="sdcard_settings_unmounted_status" product="nosdcard" msgid="9191210735703409245">"現在可以放心移除 USB 儲存裝置了。"</string>
     <string name="sdcard_settings_unmounted_status" product="default" msgid="6462544066195404905">"現在可以放心移除 SD 卡了。"</string>
     <string name="sdcard_settings_bad_removal_status" product="nosdcard" msgid="7761390725880773697">"USB 儲存裝置在使用期間遭到移除！"</string>
@@ -268,7 +268,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
     <string name="radio_controls_title" msgid="6889937359495515769">"更多內容…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"管理 Wi-Fi、藍牙、飛行模式、行動網路和 VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"漫遊服務"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫遊時連線到資料傳輸服務"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"漫遊時連線到資料傳輸服務"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在鎖定畫面上顯示使用者資訊"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"使用者資訊"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在鎖定畫面上顯示個人資料資訊"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"個人資料資訊"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"位置資訊存取"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
@@ -377,7 +379,7 @@
     <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN 碼最少要有 %d 位數字"</string>
     <string name="lockpassword_press_continue" msgid="122706614386757182">"完成時請輕觸 [繼續]"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
-    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密碼最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
+    <string name="lockpassword_password_too_long" msgid="7016906583950201704">"密碼必須少於 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
     <string name="lockpassword_pin_too_long" msgid="6419879099090294052">"PIN 最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個數字。"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="1079053457942945709">"PIN 只能包含數字 0-9。"</string>
     <string name="lockpassword_pin_recently_used" msgid="7909781183925861119">"裝置管理員不允許使用最近用過的 PIN。"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"裝置管理"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"裝置管理員"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或撤銷裝置管理員"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"通知存取權"</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 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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"藍牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"開啟藍牙"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"藍牙"</string>
@@ -494,7 +505,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"記住設定"</string>
     <string name="wifi_display_settings_title" msgid="564299108014609382">"無線螢幕分享"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"如要查看裝置，請開啟無線螢幕分享。"</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"WiFi 處於關閉狀態，因此已停用無線螢幕分享。"</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"無線顯示裝置因 Wi-Fi 關閉而停用。"</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"搜尋顯示裝置"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"搜尋中…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"找不到附近的無線顯示裝置。"</string>
@@ -524,50 +535,57 @@
     <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="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"開啟 Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Wi-Fi 設定"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"開啟 Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Wi-Fi 設定"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"設定、管理無線網路存取點"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"選取 WiFi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Wi-Fi 開啟中…"</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"正在關閉 Wi-Fi…"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"選取 Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"正在開啟 Wi-Fi…"</string>
+    <string name="wifi_stopping" msgid="8952524572499500804">"正在關閉 Wi-Fi…"</string>
     <string name="wifi_error" msgid="3207971103917128179">"錯誤"</string>
     <string name="wifi_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="3038290727701553612">"有開放網路時通知我"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避開品質不佳的連線"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"休眠狀態仍保持 Wi-Fi 連線"</string>
+    <string name="wifi_poor_network_detection_summary" msgid="7843672905900544785">"除非 Wi-Fi 網路連線狀態良好，否則不使用"</string>
+    <string name="wifi_scan_always_available" msgid="3470564139944368030">"一律執行掃描"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"允許 Google 的定位服務和其他應用程式掃描網路 (即使 Wi-Fi 已關閉)"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"安裝憑證"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"為了提升定位精確度及用於其他用途，Google 和其他應用程式可能會掃描附近的 Wi-Fi 網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"應用程式可能會掃描附近的網路 (即使 Wi-Fi 連線功能已關閉)。如果您不想授予這項權限，可隨時前往 [進階] &gt; [掃描] 變更設定。"</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"不要再顯示"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠狀態仍保持 Wi-Fi 連線"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"變更設定時發生問題"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"WiFi 最佳化"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"開啟 WiFi 時盡可能節約電池用量"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi 最佳化"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"開啟 Wi-Fi 時儘可能節約電池用量"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"新增網路"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi 網路"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi 網路"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS 按鈕"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"更多選項"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"輸入 WPS 個人識別碼"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"WiFi Direct"</string>
+    <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_connect" msgid="4996220309848349408">"連線至網路"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"清除網路"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網路"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"如要查看可用的網路，請開啟 Wi-Fi。"</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"正在搜尋  Wi-Fi 網路…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"如要查看可用的網路，請開啟 Wi-Fi。"</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜尋 Wi-Fi 網路…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"您沒有變更 Wi-Fi 網路的權限。"</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"其他網路…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"自動設定 (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"您的平板電腦必須連上 WiFi 網路才能完成設定。設定完成後，您可以在行動數據網路與 WiFi 網路之間切換。"</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"您的平板電腦必須連上 Wi-Fi 網路才能完成設定。設定完成後，您可以切換使用行動數據網路或 Wi-Fi 網路。"</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"顯示進階選項"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"WiFi 保護設定"</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="7204827509934892103">"按下路由器上的 Wi-Fi 保護設定按鈕，該按鈕可能標示為「WPS」或含有這個符號："</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"請在 WiFi 路由器上輸入 PIN 碼：<xliff:g id="NUMBER">%1$s</xliff:g>。最多需要兩分鐘才能完成設定。"</string>
+    <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"請按路由器上的 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="5754399645462924103">"已連線至 WiFi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"已連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS 已開始執行，最多需要兩分鐘才能完成。"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 無法成功啟動，請過幾分鐘後再試一次。"</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"不支援無線路由器安全性設定 (WEP)"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"驗證失敗，請再試一次。"</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"偵測到另一個 WPS 工作階段，請稍候再試。"</string>
     <string name="wifi_ssid" msgid="641393708309146745">"網路 SSID"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"輸入 SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"安全性"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"訊號強度"</string>
     <string name="wifi_status" msgid="4824568012414605414">"狀態"</string>
@@ -601,6 +620,9 @@
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</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_confirm_allow" msgid="5355973075896817232">"允許"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒絕"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"連線"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"無法連線至網路"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"清除"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"不要略過"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"警告：您可能需支付額外的數據傳輸費用。"\n\n"平板電腦設定程序可能需要佔用大量網路流量。"</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"警告：您可能需支付額外的數據傳輸費用。"\n\n"手機設定程序可能需要佔用大量網路流量。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"警告：無法透過您的平板電腦驗證軟體是否為最新版本。"</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"警告：無法透過您的手機驗證軟體是否為最新版本。"</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"您的平板電腦無法連線到這個 WiFi 網路。"</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"您的手機無法連線到這個 WiFi 網路。"</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"進階 Wi-Fi"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Wi-Fi 頻帶"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"警告：連上網際網路後，平板電腦才能驗證您所使用的軟體是否為最新版本。"</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"警告：連上網際網路後，手機才能驗證您所使用的軟體是否為最新版本。"</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"您的平板電腦無法連線至這個 Wi-Fi 網路。"</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"您的手機無法連線至這個 Wi-Fi 網路。"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 Wi-Fi"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Wi-Fi 頻帶"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"指定作業的頻率範圍"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"設定頻帶時發生問題。"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC 位址"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"閘道"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"網路前置碼長度"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"Wi-Fi Direct"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi-Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"裝置資訊"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"記住這個連線"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"搜尋裝置"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請？"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"刪除這個群組？"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"可攜式 Wi-Fi 無線基地台"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式無線基地台 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"設定 WiFi 無線基地台"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<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_failed_subtext" msgid="1484941858530919002">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"設定 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="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"訊號強度"</string>
     <string name="status_roaming" msgid="2638800467430913403">"漫遊"</string>
     <string name="status_operator" msgid="2274875196954742087">"網路"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Wi-Fi MAC 位址"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Wi-Fi MAC 位址"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"藍牙位址"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"序號"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"無法取得"</string>
@@ -803,7 +825,7 @@
     <string name="memory_available_read_only" msgid="6497534390167920206">"可用空間 (唯讀)"</string>
     <string name="memory_size" msgid="6629067715017232195">"總空間"</string>
     <string name="memory_calculating_size" msgid="2188358544203768588">"計算中…"</string>
-    <string name="memory_apps_usage" msgid="2348501997988663688">"應用程式 (應用程式資料和媒體內容)"</string>
+    <string name="memory_apps_usage" msgid="2348501997988663688">"應用程式 (相關資料和媒體內容)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"媒體"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"下載"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"圖片、影片"</string>
@@ -879,6 +901,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN 已啟用"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN 已停用"</string>
     <string name="bearer" msgid="594270280031923558">"承載系統"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"MVNO 類型"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"MVNO 值"</string>
     <string name="menu_delete" msgid="6981294422841124659">"刪除 APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"新增 APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"儲存"</string>
@@ -955,9 +979,9 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"說明"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"行動網路"</string>
     <string name="location_title" msgid="1029961368397484576">"我的位置"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"WiFi 和行動網路位置資訊"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和行動網路位置"</string>
     <string name="location_neighborhood_level" msgid="5626515380188353712">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
-    <string name="location_neighborhood_level_wifi" msgid="7457348712272184793">"根據 Wi-Fi 判定位置"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS 衛星定位"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"允許應用程式使用平板電腦的 GPS 找出您的精確位置"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"允許應用程式使用手機的 GPS 找出您的精確位置"</string>
@@ -967,7 +991,7 @@
     <string name="use_location_title" msgid="5206937465504979977">"位置資訊與 Google 搜尋"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"允許 Google 使用您的位置資訊來改善搜尋結果和其他服務"</string>
     <string name="location_access_title" msgid="7064108942964081243">"存取我的位置資訊"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"允許向您取得許可的應用程式使用您的位置資訊"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"允許獲得您許可的應用程式使用您的位置資訊"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"位置資訊來源"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"關於平板電腦"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"關於手機"</string>
@@ -1082,6 +1106,7 @@
     <string name="filter" msgid="2018011724373033887">"篩選"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"選擇篩選器選項"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"全部"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"已停用"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"已下載"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"執行中"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB 儲存裝置"</string>
@@ -1106,8 +1131,8 @@
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"無法清除應用程式的資料。"</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"這個應用程式可存取您平板電腦中的下列項目："</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"這個應用程式可存取您手機上的下列項目："</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"這個應用程式可存取您平板電腦上的下列項目。由於「<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>」可在與「<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>」相同的程序中執行，為增進效能及降低記憶體用量，應用程式可以使用部分權限："</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"這個應用程式可存取您手機上的下列項目。由於「<xliff:g id="BASE_APP_NAME">%1$s</xliff:g>」可在與「<xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>」相同的程序中執行，為增進效能及降低記憶體用量，應用程式可以使用部分權限："</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"這個應用程式可存取您平板電腦上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"這個應用程式可存取您手機上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>和<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g>和<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
     <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>，<xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
@@ -1141,6 +1166,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"如果您停用內建應用程式，其他應用程式可能無法正常運作，您的資料也會遭到刪除。"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"關閉通知？"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果您關閉這個應用程式的通知，可能會錯失重要的警示與更新。"</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"應用程式作業"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"執行中"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(從未使用)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"儲存空間使用量"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"查看應用程式的儲存空間使用量"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
@@ -1192,7 +1220,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"實體鍵盤設定"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空白鍵兩次可插入「.」"</string>
     <string name="show_password" msgid="3001113966880559611">"顯示密碼"</string>
-    <string name="ime_security_warning" msgid="4135828934735934248">"此輸入法可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。此輸入法來自「<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>」應用程式。是否要使用此輸入法？"</string>
+    <string name="ime_security_warning" msgid="4135828934735934248">"這個輸入法是由「<xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>」應用程式所提供，它可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。要啟用這個輸入法嗎？"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"這個拼字檢查程式可能會收集您輸入的所有文字，包括密碼和信用卡號等個人資料。該程式是由應用程式「<xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>」所提供，要使用這個拼字檢查程式嗎？"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"設定"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"語言"</string>
@@ -1220,6 +1248,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"字詞："</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"捷徑："</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"語言："</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"輸入字詞"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"可選用的快速鍵"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"編輯文字"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"編輯"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"刪除"</string>
@@ -1260,8 +1290,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"實體鍵盤設定"</string>
     <string name="development_settings_title" msgid="215179176067683667">"開發人員選項"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"設定應用程式開發選項"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"這位使用者無法使用開發人員選項"</string>
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"撤銷 USB 偵錯授權"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"電源選單錯誤報告"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中納入取得錯誤報告的選項"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"保持清醒"</string>
@@ -1270,6 +1302,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"允許開發設定？"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"這些設定僅供開發之用，可能導致您的裝置及裝置中的應用程式毀損或運作異常。"</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"透過 USB 驗證應用程式"</string>
@@ -1311,26 +1344,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"螢幕放大"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自動更新螢幕放大設定"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"更新應用程式轉場後的螢幕放大設定"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"電源鍵可結束通話"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"按電源鍵結束通話"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"說出密碼"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"輕觸並按住的延遲時間"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"增強網頁協助工具"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"設定"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"開啟"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"關閉"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"允許"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"不允許"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"允許"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"不允許"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」會收集您輸入的所有文字 (惟密碼除外)，包括信用卡號等個人資料。此外，該項服務也會收集您與平板電腦互動的資料。"</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"「<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g>」會收集您輸入的所有文字 (惟密碼除外)，包括信用卡號等個人資料。此外，該項服務也會收集您與手機互動的資料。"</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"輕觸 [確定] 會讓「<xliff:g id="SERVICE">%1$s</xliff:g>」停止。"</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"記錄您的操作行為"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"在您與應用程式互動時接收通知。"</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"輕觸 [確定] 會讓「<xliff:g id="SERVICE">%1$s</xliff:g>」停止。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"需要螢幕閱讀器嗎？"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"TalkBack 提供語音回應功能協助視障或視力不佳的使用者。現在可以免費從 Android Market 安裝這項功能，您要安裝嗎？"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"您要允許應用程式安裝 Google 提供的指令碼，讓其網路內容更容易存取嗎？"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"電池"</string>
@@ -1344,14 +1372,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"充電"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"螢幕已開"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"開啟 GPS"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi‑Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"清醒"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"行動網路訊號"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"裝置清醒時間"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"開啟 Wi-Fi 的時間"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"開啟 Wi-Fi 的時間"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"開啟 Wi-Fi 的時間"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"開啟 Wi-Fi 的時間"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"詳細記錄"</string>
     <string name="details_title" msgid="3792801565213935385">"詳細使用狀況"</string>
@@ -1359,7 +1387,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"調整電力使用"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"已包含封裝檔案"</string>
     <string name="power_screen" msgid="3023346080675904613">"螢幕"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"藍牙"</string>
     <string name="power_cell" msgid="6596471490976003056">"手機待機"</string>
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
@@ -1367,9 +1395,9 @@
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU 總使用時間"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU 前端使用狀況"</string>
-    <string name="usage_type_wake_lock" msgid="5125438890233677880">"保持清醒"</string>
+    <string name="usage_type_wake_lock" msgid="5125438890233677880">"停用休眠"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"Wi-Fi 執行中"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"Wi-Fi 執行中"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"平板電腦"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"手機"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"已傳送資料"</string>
@@ -1382,7 +1410,7 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"應用程式資訊"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"應用程式設定"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"螢幕設定"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Wi-Fi 設定"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Wi-Fi 設定"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"藍牙設定"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"語音通話耗電量"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"平板電腦閒置時的耗電量"</string>
@@ -1391,8 +1419,8 @@
     <string name="battery_sugg_radio" msgid="8211336978326295047">"切換到飛行模式，以便裝置不在服務涵蓋範圍時能節省電力"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"顯示與背光啟動時的耗電量"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"降低螢幕亮度和/或螢幕自動關閉時間"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Wi-Fi 耗電量"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"未使用或無法使用 Wi-Fi 時即關閉 Wi-Fi"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Wi-Fi 耗電量"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"未使用或無法使用 Wi-Fi 時即關閉 Wi-Fi"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"藍牙用電量"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"未使用藍牙時即關閉藍牙"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"試著連線至其他藍牙裝置"</string>
@@ -1438,6 +1466,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"設定"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"選擇其他引擎"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"此語音合成引擎可能會收集您輸入的所有語音，包括密碼和信用卡號等個人資料。此引擎來自「<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>」引擎，是否要使用此語音合成引擎？"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"您必須連上網路才能使用文字轉語音輸出功能。"</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"引擎"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>設定"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"已啟用 <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g>"</string>
@@ -1455,14 +1484,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"偏好的引擎"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"一般"</string>
     <string name="gadget_title" msgid="5519037532720577836">"電源控制"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"正在更新 Wi-Fi 設定"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"更新 Wi-Fi 設定"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"正在更新藍牙設定"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"開啟"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"關閉"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"開啟中"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"關閉中"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"WiFi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"藍牙"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"同步處理"</string>
@@ -1485,6 +1514,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"儲存空間類型"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬體備份"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"僅限軟體"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖形"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1506,7 +1538,7 @@
     <string name="backup_section_title" msgid="7952232291452882740">"備份與還原"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"個人資料"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"備份我的資料"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"將應用程式資料、Wi-Fi 密碼，以及其他設定備份到 Google 伺服器"</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="auto_restore_title" msgid="5397528966329126506">"自動還原功能"</string>
@@ -1518,7 +1550,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"新密碼與確認密碼不符。"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"無法設定備份密碼"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"停止備份您的 Wi-Fi 密碼、書籤、其他設定，以及應用程式資料，並清除 Google 伺服器上儲存的所有副本嗎？"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"停止備份您的 Wi-Fi 密碼、書籤、其他設定，以及應用程式資料，並清除 Google 伺服器上儲存的所有複本嗎？"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"裝置管理設定"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"裝置管理員"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"撤銷"</string>
@@ -1534,10 +1566,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"通知"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"來電鈴聲與震動"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"系統"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Wi-Fi 設定"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"正在連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"已連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Wi-Fi 設定"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"正在連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"已連線至 Wi-Fi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"新增網路"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"尚未連線"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"新增網路"</string>
@@ -1559,9 +1591,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"連線中…"</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"前往下一個步驟"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP 不受支援。"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"您無法在設定精靈運作期間調整 EAP Wi-Fi 連線設定。如要調整 EAP Wi-Fi 連線設定，請在設定精靈完成後，前往 [設定] 的 [無線與網路] 調整相關設定。"</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"設定精靈執行期間無法調整 EAP Wi-Fi 連線設定。請在設定精靈完成後，前往 [設定] 的 [無線與網路] 調整相關設定。"</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"連線中，請稍候幾分鐘…"</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"輕觸 [下一步]"<b></b>" 即可繼續安裝；"\n\n"輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續設定程序；"\n\n"輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步處理已啟用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步處理已停用"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤。"</string>
@@ -1626,9 +1658,10 @@
     <string name="select_application" msgid="5156029161289091703">"選取應用程式"</string>
     <string name="no_application" msgid="2813387563129153880">"無"</string>
     <string name="wait_for_debugger" msgid="1202370874528893091">"等待偵錯程式"</string>
-    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"先等待偵錯程式附加至偵錯程序，再對要接受偵錯的應用程式開始執行"</string>
+    <string name="wait_for_debugger_summary" msgid="1766918303462746804">"執行受偵錯的應用程式之前，先等待偵錯程序附加完成"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"輸入"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"繪圖"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"硬體加速轉譯"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"監控"</string>
     <string name="strict_mode" msgid="1938795874357830695">"嚴格模式已啟用"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"當應用程式在主執行緒中進行長時間作業時，讓螢幕閃爍"</string>
@@ -1646,11 +1679,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"從優到劣依序顯示：藍色、綠色、淺紅色、紅色"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"停用硬體重疊圖層"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"啟用追蹤項目"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"選取已啟用的追蹤項目"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"目前未啟用任何追蹤項目"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"目前已啟用 <xliff:g id="NUM">%1$d</xliff:g> 個追蹤項目"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"目前已啟用所有追蹤項目"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"啟用 OpenGL 追蹤"</string>
     <string name="debug_layout" msgid="5981361776594526155">"顯示版面配置界限"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等。"</string>
@@ -1660,8 +1688,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"強制使用 GPU 進行 2D 繪圖"</string>
     <string name="force_msaa" msgid="7920323238677284387">"強制 4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"在 OpenGL ES 2.0 應用程式中啟用 4x MSAA"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"針對非矩形裁剪操作進行偵錯"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"剖析 GPU 轉譯"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"測量「adb shell dumpsys gfxinfo」指令中的轉譯時間"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"視窗動畫比例"</string>
     <string name="transition_animation_scale_title" msgid="387527540523595875">"轉場動畫比例"</string>
     <string name="animator_duration_scale_title" msgid="3406722410819934083">"動畫影片長度比例"</string>
@@ -1672,12 +1700,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"背景處理程序限制"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"顯示所有無回應程式"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"為背景應用程式顯示「應用程式無回應」對話方塊"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"使用實驗性 WebView"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"應用程式將會使用最新的 (測試版) WebView"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"資料用量"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"資料用量週期"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"漫遊服務"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"限制背景資料"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"獨立顯示 4G 用量"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"顯示 Wi-Fi 用量"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"顯示 Wi-Fi 用量"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"顯示乙太網路使用量"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"行動熱點"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"自動同步處理資料"</string>
@@ -1691,8 +1721,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"設定行動數據上限"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"設定 4G 數據上限"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"設定 2G 至 3G 的數據上限"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"設定 Wi-Fi 數據上限"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"設定 Wi-Fi 數據上限"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"乙太網路"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"行動數據"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1723,9 +1753,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的平板電腦來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"達到指定的流量上限時，系統會停用您的行動數據連線。"\n\n"由於資料用量需依您的手機來計算，而您的行動通訊業者計費方式可能有所不同，請考慮採用保守估計的上限值。"</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"限制背景資料？"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"如果您限制背景行動數據傳輸，則必須連線至 Wi-Fi 網路，否則部分應用程式和服務無法運作。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"如果您限制背景行動數據傳輸量，則必須連線至 WiFi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這台平板電腦的所有使用者。"</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"如果您限制背景行動數據傳輸量，則必須連線至 WiFi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這支手機的所有使用者。"</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這台平板電腦的所有使用者。"</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"若限制背景行動數據傳輸量，必須連線至 Wi-Fi 網路，部分應用程式和服務才能運作。"\n\n"這項設定會影響這支手機的所有使用者。"</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"警告"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"限制"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"移除的應用程式"</string>
@@ -1735,10 +1765,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於資料用量的計算方式可能會有所不同。"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的行動通訊業者對於資料用量的計算方式可能會有所不同。"</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"行動熱點"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"選取行動熱點 WiFi 網路。背景應用程式在使用這類網路時可能會受到限制。在透過這些網路下載大量資料時，應用程式也可能會提出警告。"</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"選取行動熱點 Wi-Fi 網路。背景應用程式在使用這類網路時可能會受到限制。在透過這些網路下載大量資料時，應用程式也可能會提出警告。"</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"行動網路"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"WiFi 網路"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"如要選取行動熱點，請開啟 WiFi。"</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Wi-Fi 網路"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"如要選取行動熱點，請開啟 Wi-Fi。"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"緊急電話"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"返回通話"</string>
     <string name="vpn_name" msgid="4689699885361002297">"名稱"</string>
@@ -1796,34 +1826,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"許可"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"執行中"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"使用者"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"您"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"其他使用者"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"使用中"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"非使用中"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"使用者和個人資料"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"新增使用者或個人資料"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"設有限制的個人資料"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"如要建立設有限制的個人資料，您必須先設定螢幕鎖定來保護您的應用程式和個人資料。"</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"設定鎖定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"尚未設定"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"尚未建立 - 設有限制的個人資料"</string>
     <string name="user_owner" msgid="3879126011135546571">"擁有者"</string>
+    <string name="user_you" msgid="1639158809315025986">"您 (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"暱稱"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"新增"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"使用者擁有個人專屬的應用程式和內容"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"您可以限制他人透過您的帳戶存取應用程式和內容"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"使用者"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"設有限制的個人資料"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"新增使用者"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"您可以建立額外的使用者，藉此與其他人共用這個裝置。每位使用者都擁有個人空間，可使用自己的應用程式、桌布等等，並且自訂這些項目。此外，使用者可以調整平板電腦設定 (例如 WiFi 這類會使所有人受到影響的設定)。"\n\n"您建立新的使用者之後，對方必須完成設定程序。"\n\n"任何使用者都可以代表所有其他使用者接受更新的應用程式權限。"</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"您可以建立更多使用者，與更多人共用此裝置。每位使用者都擁有個人空間，可使用並自訂個人的應用程式和桌布等等。此外，使用者可以調整平板電腦設定 (例如會影響所有人的 Wi-Fi 設定)。"\n\n"建立新的使用者之後，必須請新使用者完成設定程序。"\n\n"任何使用者都可以代表其他所有使用者接受更新的應用程式權限。"</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"您建立新的使用者之後，對方必須完成設定程序。"\n\n"任何使用者都可以代表所有其他使用者接受更新的應用程式權限。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者？"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"請確保對方可以使用平板電腦並設定自己的空間"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"立即建立個人資料？"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"立即設定"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"暫時不要"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"只有手機的擁有者可以管理使用者。"</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"設有限制的個人資料無法新增帳戶"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這個裝置中刪除"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"新的個人資料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"移除使用者？"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"移除個人資料？"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"您在這台平板電腦上的可用空間和資料將會消失，這個動作無法復原。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"您在這支手機上的可用空間和資料將會消失，這個動作無法復原。"</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"這位使用者在這台平板電腦上的可用空間和資料將會消失，這個動作無法復原。"</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"這位使用者在這支手機上的可用空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"這個使用者個人資料在這台平板電腦上的可用空間和資料將會消失，而且這個動作無法復原。"</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"這個使用者個人資料在這支手機上的可用空間和資料將會消失，而且這個動作無法復原。"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在新增使用者…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"刪除使用者"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"刪除"</string>
+    <string name="application_restrictions" msgid="8207332020898004394">"允許應用程式和內容"</string>
+    <string name="apps_with_restrictions_header" msgid="3660449891478534440">"受限的應用程式"</string>
+    <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"展開應用程式設定"</string>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"這項設定會影響這台平板電腦的所有使用者。"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"這項設定會影響這支手機的所有使用者。"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"變更語言"</string>
@@ -1834,4 +1880,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"選取要顯示的緊急警示類型。"</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"應用程式與內容限制"</string>
+    <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"設定應用程式限制"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"允許修改藍牙配對與設定"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"允許平板電腦與其他裝置接觸時交換資料"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"允許手機與其他裝置接觸時交換資料"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"位置資訊存取"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"允許應用程式使用您的位置資訊"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"返回"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"下一步"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"完成"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"拍攝相片"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"從圖片庫選擇相片"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 642d647..605e32d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -70,7 +70,11 @@
     <item msgid="2361722960903353554">"Phansi"</item>
     <item msgid="1145554631248513562">"Jwayelekile"</item>
     <item msgid="7553665153391107454">"Sheshayo"</item>
-    <item msgid="2538100882620724753">"Kushesha kakhulu"</item>
+    <item msgid="1370673569131070146">"Ngokushesha"</item>
+    <item msgid="4648206845228970803">"Kushesha kakhulu"</item>
+    <item msgid="4977949754169483251">"Esheshisayo"</item>
+    <item msgid="6106302964845503577">"Esheshisa kakhulu"</item>
+    <item msgid="6800277205640837264">"Esheshisa kakhulukhulu"</item>
   </string-array>
   <string-array name="tts_pitch_entries">
     <item msgid="7526050907652687351">"Phansi kakhulu"</item>
@@ -114,6 +118,9 @@
     <!-- 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) -->
+    <!-- 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>
@@ -170,6 +177,11 @@
     <item msgid="7182812872984827322">"I-TTLS"</item>
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
+  <string-array name="wifi_peap_phase2_entries">
+    <item msgid="2577747762745812488">"Lutho"</item>
+    <item msgid="937786527870979616">"I-MSCHAPV2"</item>
+    <item msgid="5302613883318643629">"I-GTC"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Lutho"</item>
     <item msgid="6189918678874123056">"I-PAP"</item>
@@ -206,11 +218,89 @@
     <item msgid="3044323519470167625">"eHRPD"</item>
     <item msgid="6848428671997893147">"(okungacacisiwe)"</item>
   </string-array>
+  <string-array name="mvno_type_entries">
+    <item msgid="4367119357633573465">"Lutho"</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">"Isitoreji sedivaysi yangaphakathi"</item>
     <item msgid="3738430123799803530">"Khipha ikhadi le-SD"</item>
     <item msgid="4498124044785815005">"Vumela isistimu inqume"</item>
   </string-array>
+  <string-array name="app_ops_categories">
+    <item msgid="6358963769537892925">"Indawo"</item>
+    <item msgid="255608127647030286">"Okomuntu siqu"</item>
+    <item msgid="4588829735729884491">"Imilayezo"</item>
+    <item msgid="8971765125227378270">"Idivayisi"</item>
+  </string-array>
+  <string-array name="app_ops_summaries">
+    <item msgid="4979188868761515915">"indawo emaholoholo"</item>
+    <item msgid="5789673140227507995">"indawo elungile"</item>
+    <item msgid="1061584358377390581">"I-GPS"</item>
+    <item msgid="5387405117297558954">"dlidliza"</item>
+    <item msgid="3434165993711230924">"funda oxhumana nabo"</item>
+    <item msgid="616161687718081936">"shintsha oxhumana nabo"</item>
+    <item msgid="7638002295329050091">"funda irekhodi lwamakholi"</item>
+    <item msgid="6546959730920410907">"shintsha irekhodi lwamakholi"</item>
+    <item msgid="446877710771379667">"funda ikhalenda"</item>
+    <item msgid="7674458294386319722">"shintsha ikhalenda"</item>
+    <item msgid="8281201165558093009">"isikeni se-Wi-Fi"</item>
+    <item msgid="8694611243479480497">"isaziso"</item>
+    <item msgid="7776439107987345446">"ukuskena iseli"</item>
+    <item msgid="514615766544675057">"shayela ifoni"</item>
+    <item msgid="8181415497109310680">"funda i-SMS"</item>
+    <item msgid="6816551144382117307">"bhala i-SMS"</item>
+    <item msgid="4600463921908905030">"thola i-SMS"</item>
+    <item msgid="5958926493289432745">"thola i-SMS yezimo eziphuthumayo"</item>
+    <item msgid="4945269495221089540">"thola i-MMS"</item>
+    <item msgid="5570472453573929087">"thola ukuphushwa kwe-WAP"</item>
+    <item msgid="7125408150230860501">"Thumela i-SMS"</item>
+    <item msgid="7080337936612188061">"Funda i-ICC SMS"</item>
+    <item msgid="587124103118495063">"bhala i-ICC SMS"</item>
+    <item msgid="2320577158869025503">"shintsha izilungiselelo"</item>
+    <item msgid="1545733463471924009">"dweba ngaphezulu"</item>
+    <item msgid="3609046903962454582">"finyelela kuzaziso"</item>
+    <item msgid="4671646036128214513">"ikhamera"</item>
+    <item msgid="1097324338692486211">"qopha umsindo"</item>
+    <item msgid="5031552983987798163">"dlala umsindo"</item>
+    <item msgid="8374996688066472414">"funda ibhodi lokunamathisela"</item>
+    <item msgid="3045529469061083747">"shintsha ibhodi lokunamathisela"</item>
+  </string-array>
+  <string-array name="app_ops_labels">
+    <item msgid="6602854600289714121">"Indawo"</item>
+    <item msgid="8677040780775113033">"Indawo"</item>
+    <item msgid="1660743989948992916">"Indawo"</item>
+    <item msgid="8791172739860195290">"Dlidliza"</item>
+    <item msgid="383413555642128046">"Funda oxhumana nabo"</item>
+    <item msgid="3654594895269697313">"Shintsha oxhumana nabo"</item>
+    <item msgid="7928393476362362538">"Funda irekhodi lwamakholi"</item>
+    <item msgid="6248591205254641116">"Shintsha irekhodi lwamakholi"</item>
+    <item msgid="6093344633066170692">"Funda ikhalenda"</item>
+    <item msgid="1334886368750347692">"Shintsha ikhalenda"</item>
+    <item msgid="1638204101698708656">"Indawo"</item>
+    <item msgid="2154671955760380322">"Isaziso sokuthunyelwe"</item>
+    <item msgid="4282477730595931828">"Indawo"</item>
+    <item msgid="4891423912898525905">"Shayela ifoni"</item>
+    <item msgid="626463821668200388">"Thola i-SMS/MMS"</item>
+    <item msgid="1237538540368797101">"Thumela i-SMS/MMS"</item>
+    <item msgid="3986142739951490025">"Thola i-SMS/MMS"</item>
+    <item msgid="3984213795861739778">"Thola i-SMS/MMS"</item>
+    <item msgid="3656243523752472788">"Thola i-SMS/MMS"</item>
+    <item msgid="8105802370238551510">"Thola i-SMS/MMS"</item>
+    <item msgid="1407766984645388488">"Thumela i-SMS/MMS"</item>
+    <item msgid="1530132603376027248">"Thola i-SMS/MMS"</item>
+    <item msgid="1188256962149204607">"Thumela i-SMS/MMS"</item>
+    <item msgid="4218544235221631789">"Shintsha izilungiselelo"</item>
+    <item msgid="736541391767350377">"Dweba ngaphezulu"</item>
+    <item msgid="5530815681721654194">"Finyelela kuzaziso"</item>
+    <item msgid="781213371706962767">"Ikhamera"</item>
+    <item msgid="1720492593061838172">"Qopha umsindo"</item>
+    <item msgid="3493046322001257041">"Dlala umsindo"</item>
+    <item msgid="136815868796597058">"Funda ibhodi lokunamathisela"</item>
+    <item msgid="5238692940326972503">"Shintsha ibhodi lokunamathisela"</item>
+  </string-array>
   <string-array name="long_press_timeout_selector_titles">
     <item msgid="3511504869290423954">"Kufushane"</item>
     <item msgid="2560532955514699713">"Okulingene"</item>
@@ -266,6 +356,17 @@
     <item msgid="5397807424362304288">"i-Systrace (izithombe)"</item>
     <item msgid="1340692776955662664">"Isitaki socingo ku-glGetError"</item>
   </string-array>
+  <string-array name="show_non_rect_clip_entries">
+    <item msgid="993742912147090253">"Valiwe"</item>
+    <item msgid="675719912558941285">"Dweba indawo yesiqeshana engesiyena unxantathu ngokuphuzi okwesibhakabhaka"</item>
+    <item msgid="1064373276095698656">"Beka obala iziqondiso ezihloliwe zokudwebela ngokuphuzi"</item>
+  </string-array>
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Valiwe"</item>
+    <item msgid="2751513398307949636">"Kusikrini njengamabha"</item>
+    <item msgid="8272260411216018353">"Kusikrini njengemigqa"</item>
+    <item msgid="120512413928262547">"Ku-adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="app_process_limit_entries">
     <item msgid="3401625457385943795">"Isilanganiso esivamile"</item>
     <item msgid="4071574792028999443">"Azikho izinqubo zesizinda"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 0b83faf..61a0bae 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -214,7 +214,7 @@
     <string name="radio_info_ppp_sent_label" msgid="5009102250704375687">"I-PPP ithunyelwe:"</string>
     <string name="radio_info_radio_resets_label" msgid="9211343458143291617">"Ukuhlela kabusha umsakazo:"</string>
     <string name="radio_info_message_waiting_label" msgid="6981842420058672207">"Umlayezo ulindile:"</string>
-    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Inombolo yocingo:"</string>
+    <string name="radio_info_phone_number_label" msgid="7192944627907412169">"Inombolo yefoni:"</string>
     <string name="radio_info_band_mode_label" msgid="441469694142042022">"Khetha ibhendi yomsakazo"</string>
     <string name="radio_info_network_type_label" msgid="3706382548257257987">"Uhlobo lwenethiwekhi:"</string>
     <string name="radio_info_set_perferred_label" msgid="9039200405863503267">"Setha uhlobo lwenethiwekhi olufisekayo:"</string>
@@ -266,9 +266,9 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Imodi yendiza"</string>
-    <string name="radio_controls_title" msgid="6889937359495515769">"Okungaphezulu…"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Okuningi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Amanethiwekhi; nokungenantambo"</string>
-    <string name="radio_controls_summary" msgid="2998818677094465517">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula, &amp; ama-VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula; nama-VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"Xhuma emasevisini edatha lapho uzulazula"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"Xhuma kumasevisi edatha lapho uzulazula"</string>
@@ -309,6 +309,8 @@
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Faka umbhalo wokubonisa kwisikrini sokuvala"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bonisa ulwazi lomsebenzisi esikrinini sokukhiya"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Ulwazi lomsebenzisi"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Bonisa ulwazi lwephrofayela ekukhiyeni isikrini"</string>
+    <string name="profile_info_settings_title" msgid="3518603215935346604">"Ulwazi lwephrofayela"</string>
     <string name="location_settings_title" msgid="4483843407328665068">"Ukufinyelela kwendawo"</string>
     <string name="security_settings_title" msgid="7945465324818485460">"Ukuphepha"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
@@ -418,6 +420,15 @@
     <string name="device_admin_title" msgid="3562216873644263804">"Ukuphatha idivaysi"</string>
     <string name="manage_device_admin" msgid="5059296715271077278">"Abaphathi bedivaysi"</string>
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Buka noma yenza abaphathi bedivaysi bengasebenzi"</string>
+    <string name="manage_notification_access" msgid="5799781079264981979">"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>
+    <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="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Vula i-Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -443,7 +454,7 @@
     <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="5957007154213560390">"Sesha amadivayisi"</string>
-    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Iyacinga..."</string>
+    <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Iyasesha..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Izilungiselelo zedivaysi"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Amadivaysi abhanqene"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Amadivayisi atholakalayo"</string>
@@ -487,14 +498,14 @@
     <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_dock_settings" msgid="3218335822716052885">"Dokha Izilungiselelo"</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_display_settings_title" msgid="564299108014609382">"Ukubonisa okungenazintambo"</string>
     <string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"Ukuze ubone amadivayisi, khanyisa ukubonisa okungenazintambo."</string>
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Ukubonisa okungenazintambo kukhutshaziwe ngoba i-Wi-Fi ivaliwe."</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="1336244693183075466">"Ukubonisa okungenazintambo kukhutshaziwe ngoba i-Wi-Fi ivaliwe."</string>
     <string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Sesha ukubonisa"</string>
     <string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Iyasesha…"</string>
     <string name="wifi_display_no_devices_found" msgid="8180582698282377626">"Akukho ukubonisa okungenazintambo okuseduze okutholakele."</string>
@@ -515,59 +526,66 @@
     <string name="wifi_display_summary_disabled" msgid="5318394806146587849">"Kukhutshaziwe"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"i-NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Vumela ukushintshanisa kwedatha uma ithebhulethi ithinta enye idivayisi"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Vumela ukushintshanisa kwe-data uma ucingo luthinta enye idivayisi"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Vumela ukushintshanisa kwedatha uma ifoni ithinta enye idivayisi"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"i-Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Ilungele ukudlulisa insiza nge-NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Ilungele ukudlulisa okuqukethwe uhlelo lokusebenza nge-NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Valiwe"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ayitholakali ngoba i-NFC icishiwe"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"i-Android Beam"</string>
     <string name="android_beam_explained" msgid="6981652347448777459">"Uma kuvulwe lesi sici, ungadlulisa okuqukethwe okusetshenziswayo kwenye ikhebuli ye-NFC ngokumisa amadivayisi enye eduze kwenye. Isibonelo ungahlanganisa amakhasi Esiphequluli, amavidiyo ka-YouTube, kwezokuxhumana nabantu, kanye nokunye."\n\n"Hlanganisa amadivayisi ndawonye (ngokujwayelekile enye ngemuva kwenye) bese uthinta isikrini sakho. Uhlelo lokusebenza luyathola ukuthi yini ezoba-beamed."</string>
     <string name="nsd_quick_toggle_title" msgid="3125572815278848258">"Ukutholwa kwesevisi yenethiwekhi"</string>
     <string name="nsd_quick_toggle_summary" msgid="155692215972781276">"Vumela izinhlelo zokusebenza kwamanye amadivayisi ukuthola izinhlelo zokusebenza kule divayisi"</string>
-    <string name="wifi_quick_toggle_title" msgid="874495178395350104">"Wi-Fi"</string>
-    <string name="wifi_quick_toggle_summary" msgid="1047950931623694366">"Vula i-Wi-Fi"</string>
-    <string name="wifi_settings" msgid="1277428034634973011">"Wi-Fi"</string>
-    <string name="wifi_settings_category" msgid="2810363951104753710">"Izilungiselelo ze-Wi-Fi"</string>
-    <string name="wifi_settings_title" msgid="4351120897298124250">"Wi-Fi"</string>
+    <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"I-Wi-Fi"</string>
+    <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Vula i-Wi-Fi"</string>
+    <string name="wifi_settings" msgid="29722149822540994">"I-Wi-Fi"</string>
+    <string name="wifi_settings_category" msgid="8719175790520448014">"Izilungiselelo ze-Wi-Fi"</string>
+    <string name="wifi_settings_title" msgid="3103415012485692233">"I-Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="668767638556052820">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
-    <string name="wifi_setup_wizard_title" msgid="70277346338812325">"Khetha i-Wi-Fi"</string>
-    <string name="wifi_starting" msgid="6716593470710880000">"Ivula i-Wi-Fi..."</string>
-    <string name="wifi_stopping" msgid="244864762599017659">"Ivala Ukuxhumana kengenazintambo"</string>
+    <string name="wifi_setup_wizard_title" msgid="8242230950011819054">"Khetha i-Wi-Fi"</string>
+    <string name="wifi_starting" msgid="6732377932749942954">"Ivula i-Wi-Fi..."</string>
+    <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="3038290727701553612">"Ngazise lapho inethiwekhi evulekile itholakala"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Gwema uxhumo olubi"</string>
-    <string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle kokuthi inoxhumano lwe-intanethi olukahle."</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Gcina i-Wi-Fi isebenza ngenkathi ilele"</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_scan_always_available" msgid="3470564139944368030">"Ukuskena kuhlala njalo kutholakala"</string>
+    <string name="wifi_scan_always_available_summary" msgid="7768204638882691453">"Vumela isevisi yendawo ye-Google nezinye izinhlelo zokusebenza ukuthi ziskenele amanethiwekhi, noma ngabe i-Wi-Fi ivaliwe"</string>
+    <string name="wifi_install_credentials" msgid="3551143317298272860">"Faka izitifiketi"</string>
+    <string name="wifi_scan_notify_text_location_on" msgid="8135076005488914200">"Ukuthuthukisa ukulunga kwendawo nezinye izinjongo, i-Google nezinye izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
+    <string name="wifi_scan_notify_text_location_off" msgid="6323983741393280935">"Izinhlelo zokusebenza zingaskenela amanethiwekhi aseduze, noma ngabe i-Wi-Fi ivaliwe. Uma ungafuni ukuthi lokhu kwenzeke, hamba ekuskeneni okuthuthukisiwe &gt; okuhlala kutholakala."</string>
+    <string name="wifi_scan_notify_remember_choice" msgid="5340097010842405981">"Ungabonisi futhi"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Gcina i-Wi-Fi isebenza ngesikhathi sokulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
-    <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Ukuthuthukiswa kwe-Wi-Fi"</string>
-    <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Nciphisa ukusetshenziswa kwebhethri uma i-Wi-Fi ivuliwe"</string>
+    <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Ukuthuthukiswa kwe-Wi-Fi"</string>
+    <string name="wifi_suspend_optimizations_summary" msgid="4151428966089116856">"Nciphisa ukusetshenziswa kwebhethri uma i-Wi-Fi ivuliwe"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
-    <string name="wifi_access_points" msgid="2664629396767022441">"Amanethiwekhi e-Wi-Fi"</string>
+    <string name="wifi_access_points" msgid="7053990007031968609">"Amanethiwekhi e-Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Inkinobho yokuphusha ye-WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Okunye ongakhetha kukho"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Ukufakwa kwe-PIN ye-WPS"</string>
-    <string name="wifi_menu_p2p" msgid="2575893749303670353">"I-WiFi Eqondile"</string>
+    <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_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"Ukubona amanethiwekhi atholakalayo, vula i-WiFi."</string>
-    <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Isesha amanethiwekhi e-Wi-Fi…"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ukubona amanethiwekhi atholakalayo, vula i-Wi-Fi."</string>
+    <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Isesha amanethiwekhi e-Wi-Fi…"</string>
+    <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Awunayo imvume yokushintsha inethiwekhi ye-Wi-Fi."</string>
     <string name="wifi_other_network" msgid="1048006316504242214">"Enye inethiwekhi…"</string>
     <string name="wifi_more" msgid="3195296805089107950">"Okunye"</string>
     <string name="wifi_setup_wps" msgid="8128702488486283957">"Ukusetha okuzenzakalelayo (WPS)"</string>
-    <string name="wifi_required_info_text" msgid="9014073093293520112">"Ukuze uqedele ukusetha, ithebulethi yakho idinga ukufinyelela ku-Wi-Fi. Ngemva kokusetha, ungashintsha phakathi kwedatha yeselula ne-Wi-Fi."</string>
+    <string name="wifi_required_info_text" msgid="4080969509965288881">"Ukuze uqedele ukusetha, ithebhulethi yakho idinga ukufinyelela ku-Wi-Fi. Ngemva kokusetha, ungashintsha phakathi kwedatha yeselula ne-Wi-Fi."</string>
     <string name="wifi_show_advanced" msgid="1793703023711426246">"Bonisa okukhethwa kukho okuseqophelweni"</string>
-    <string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ukusethwa Okuvikelwe kwe-Wi-Fi"</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="7204827509934892103">"Cindezela inkinobho Wi-Fi Protected Setup kumzila wakho. Ingahle ibizwe nge-\"WPS\" noma iqukathe lolu phawu:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"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_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_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="5754399645462924103">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_wps_connected" msgid="7153432445748931183">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_wps_in_progress" msgid="3372311348221357944">"I-WPS isivele iyaqhubeka futhi ingathatha amaminithi angafika kwamabili ukuqedela"</string>
     <string name="wifi_wps_failed_generic" msgid="5668775022238832527">"I-WPS yehlulekile. Sicela uzame futhi emaminithini ambalawa."</string>
     <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Izilungiselelo zokuphepha zendlela engenazintambo (WEP) azisekelwe"</string>
@@ -575,6 +593,7 @@
     <string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Ukwehluleka kokugunyazwa. Sicela uzame futhi."</string>
     <string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Esinye isikhathi se-WPS sitholiwe. Sicela uzame futhi emaminithini ambalwa."</string>
     <string name="wifi_ssid" msgid="641393708309146745">"i-SSID Yenethiwekhi"</string>
+    <string name="wifi_ssid_hint" msgid="897593601067321355">"Faka i-SSID"</string>
     <string name="wifi_security" msgid="6603611185592956936">"Ukuphepha"</string>
     <string name="wifi_signal" msgid="5514120261628065287">"Amandla esiginali"</string>
     <string name="wifi_status" msgid="4824568012414605414">"Isimo"</string>
@@ -598,9 +617,12 @@
     <string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</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_secured_first_item" msgid="4072076186051083451">"ivikelwe nge <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
+    <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</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\n"Vumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Phika"</string>
     <string name="wifi_connect" msgid="1076622875777072845">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_failed_connect_message" msgid="8491902558970292871">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_forget" msgid="8168174695608386644">"Khohlwa"</string>
@@ -612,12 +634,12 @@
     <string name="wifi_dont_skip" msgid="7350341524881124808">"Ungeqi"</string>
     <string name="wifi_skipped_message" product="tablet" msgid="3335132188969450252">"ISEXWAYISO: Ungahle uthole amashaji edatha enkampani yenethiwekhi angeziwe."\n\n"Ukusethwa kwethebulethi kungadinga umsebenzi wenethiwekhi omcane."</string>
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ISEXWAYISO: Ungahle uthole amashaji edatha enkampani yenethiwekhi angeziwe."\n\n"Ukusethwa kwefoni kungadinga umsebenzi wenethiwekhi omcane."</string>
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="7682836089429990118">"ISEXWAYISO: Ithebulethi ngeke ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3324261421359832263">"ISEXWAYISO: Ifoni ngeke ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="6904081070290941807">"Ithebulethi ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
-    <string name="wifi_connect_failed_message" product="default" msgid="3894921379368046855">"Ifoni ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
-    <string name="wifi_advanced_titlebar" msgid="1627063574532930090">"Ukuxhumana kungenazintambo okuphambili"</string>
-    <string name="wifi_setting_frequency_band_title" msgid="7493768705046080060">"Ibhendi yokuvama kwe-Wi-Fi"</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ISEXWAYISO: Kuze ube nokuxhunywa kwe-intanethi, ithebulethi angeke ize ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
+    <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ISEXWAYISO: Kuze ube nokuxhunywa kwe-intanethi, ifoni angeke ize ikwazi ukuqinisekisa ukuthi isofthiwe yakho isesikhathini samanje."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Ithebhulethi ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Ifoni ayikwazanga ukuxhuma kule nethiwekhi ye-Wi-Fi."</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Ukuxhumana kungenazintambo okuphambili"</string>
+    <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Ibhendi yokuvama kwe-Wi-Fi"</string>
     <string name="wifi_setting_frequency_band_summary" msgid="3250740757118009784">"Cacisa ibanga lokuvama komsebenzi"</string>
     <string name="wifi_setting_frequency_band_error" msgid="837281974489794378">"Kube nenkinga yokuhlela ibhendi yokuvama."</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"Ikheli le-MAC"</string>
@@ -633,7 +655,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Indlela yokuphuma"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Ubude begama eliqalayo lenethiwekhi"</string>
-    <string name="wifi_p2p_settings_title" msgid="400503541488064638">"I-WiFi Eqondile"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"I-Wi-Fi eqondile"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Imininingwane yedivayisi"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Khumbula lokuxhumana"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Sesha amadivayisi"</string>
@@ -649,13 +671,13 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Khansela isimemo?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ingabe ufuna ukukhansela isimemo ukuze uxhume ne-<xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="834559380069647086">"Khohlwa leli qembu?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
-    <string name="wifi_tether_starting" msgid="1322237938998639724">"Ikhanyisa indawo ekudonseka kuyo…"</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Icima ndawo ekudonseka kuyo…"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Indawo ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
-    <string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Iphutha lendawo le-Wi-Fi ephathekayo"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Setha i-Wi-Fi hotspot"</string>
-    <string name="wifi_tether_configure_subtext" msgid="1927454307836232128">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> indawo ye-Wi-Fi ephathekayo"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi hotspot ephathekayo"</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Ivula i-hotspot…"</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Ivala i-hotspot…"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"I-hotspot ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Iphutha le-Wi-Fi hotspot ephathekayo"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Setha i-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="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
@@ -680,7 +702,7 @@
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Imisindo yokuvala isikrini"</string>
     <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Dlidliza lapho uthinta"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Ukukhansela umsindo"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"Umculo, ividiyo, imidlalo &amp; nenye imidiya"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"Umculo, ividiyo, amageyimu nenye imidiya"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Iringithoni; nezaziso"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"Izaziso"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"Ama-alamu"</string>
@@ -690,7 +712,7 @@
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Thulisa i-alamu"</string>
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Dlidlizisa uma ikhala"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokha"</string>
-    <string name="dock_settings_title" msgid="9161438664257429372">"Dokha izilungiselelo"</string>
+    <string name="dock_settings_title" msgid="9161438664257429372">"Izilungiselelo zokudokha"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Umsindo"</string>
     <string name="dock_audio_summary_desk" msgid="6487784412371139335">"Izilungiselelo zokudokha ideskithophu okunamathiselwe"</string>
     <string name="dock_audio_summary_car" msgid="6740897586006248450">"Izilungiselelo zokudokha imoto enamathiselwe"</string>
@@ -700,7 +722,7 @@
     <string name="dock_not_found_title" msgid="3290961741828952424">"Ukudokha akutholiwe"</string>
     <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"Udinga ukufaka idoki kukhompyutha yakho ngaphambi kokusetha umsindo wedoki"</string>
     <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"Udinga ukungenisa edokini ucingo ngaphambi kokusetha umsindo wedoki."</string>
-    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Dokha ingxenye umsindo wokufaka"</string>
+    <string name="dock_sounds_enable_title" msgid="885839627097024110">"Umsindo wokudokha"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"Dlala umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
@@ -771,13 +793,13 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
     <string name="device_status" msgid="607405385799807324">"Isimo"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Isimo sebhetri, inethiwekhi, nolunye ulwazi"</string>
-    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Inombolo yocingo, isiginali, nokunye."</string>
+    <string name="device_status_summary" product="default" msgid="2599162787451519618">"Inombolo yefoni, isiginali, nokunye."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Isitoreji"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Izilungiselelo zesitoreji"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Yehlisa isitoreji se-USB, buka isitoreji esivulekile"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Yehlisa ikhadi le-SD, buka isikhala sesitoreji esisele"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
-    <string name="status_number" product="default" msgid="5123197324870153205">"Inombolo yami yocingo"</string>
+    <string name="status_number" product="default" msgid="5123197324870153205">"Inombolo yami yefoni"</string>
     <string name="status_min_number" msgid="3519504522179420597">"Okuncane"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"Inguqulo ye-PRL"</string>
@@ -790,7 +812,7 @@
     <string name="status_signal_strength" msgid="3732655254188304547">"Amandla esiginali"</string>
     <string name="status_roaming" msgid="2638800467430913403">"Iyazulazula"</string>
     <string name="status_operator" msgid="2274875196954742087">"Inethiwekhi"</string>
-    <string name="status_wifi_mac_address" msgid="33109409206264790">"Ikheli le-Wi-Fi MAC"</string>
+    <string name="status_wifi_mac_address" msgid="2202206684020765378">"Ikheli le-Wi-Fi MAC"</string>
     <string name="status_bt_address" msgid="4195174192087439720">"Ikheli le-Bluetooth"</string>
     <string name="status_serial_number" msgid="2257111183374628137">"Inombolo yomkhiqizo"</string>
     <string name="status_unavailable" msgid="7862009036663793314">"Ayitholakali"</string>
@@ -805,7 +827,7 @@
     <string name="memory_calculating_size" msgid="2188358544203768588">"Iyabala..."</string>
     <string name="memory_apps_usage" msgid="2348501997988663688">"Izinhlelo zokusebenza (idatha yohlelo lokusebenza &amp; okuqukethwe kwabezindaba)"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"Imidiya"</string>
-    <string name="memory_downloads_usage" msgid="3755173051677533027">"Okulayishiwe"</string>
+    <string name="memory_downloads_usage" msgid="3755173051677533027">"Okulandiwe"</string>
     <string name="memory_dcim_usage" msgid="558887013613822577">"Izithombe, Amavidiyo"</string>
     <string name="memory_music_usage" msgid="1363785144783011606">"Umsindo (umculo, ithoni yokukhala, ama-podcasts nokunye)"</string>
     <string name="memory_media_misc_usage" msgid="235452944021647124">"Okungaziwa"</string>
@@ -880,6 +902,8 @@
     <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"I-APN ivunyeliwe"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"I-APN ayisebenzi"</string>
     <string name="bearer" msgid="594270280031923558">"Umthwali"</string>
+    <string name="mvno_type" msgid="2543253857818336421">"Uhlobo lwe-MVNO"</string>
+    <string name="mvno_match_data" msgid="4560671695220540466">"Inani le-MVNO"</string>
     <string name="menu_delete" msgid="6981294422841124659">"Susa i-APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"I-APN Entsha"</string>
     <string name="menu_save" msgid="8109345640668285399">"Londoloza"</string>
@@ -895,8 +919,8 @@
     <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 imininingo  "<b>"ekwindawo yokugcina okungaphakathi ye-tablet yakho"</b>", ehlanganisa:"\n\n<li>"I-akhawunti yakho ka-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 imininingo  "<b>"ekwindawo yokugcina okungaphakathi ye-tablet yakho"</b>", ehlanganisa:"\n\n<li>"I-akhawunti yakho ka-Google"</li>\n<li>"Uhlelo lokusebenza kanye nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilayishiwe"</li></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>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
@@ -907,7 +931,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Setha kabusha ithebhulethi"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Setha kabusha ifoni"</string>
-    <string name="master_clear_final_desc" msgid="7209547812233487345">"Susa yonkr imininingwane yomuntu kanye nezinhlelo zokusebenza ezilayishiwe? Ngeke ukwazi ukuguqula lokhu!"</string>
+    <string name="master_clear_final_desc" msgid="7209547812233487345">"Susa lonke ulwazi lomuntu kanye nezinhlelo zokusebenza ezilayishiwe? Ngeke ukwazi ukuguqula lokhu!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Sula yonke into"</string>
     <string name="master_clear_gesture_prompt" msgid="1428645764883536750">"Dweba iphathini yakho yokuvula"</string>
     <string name="master_clear_gesture_explanation" msgid="826193821455182780">"Udinga ukudweba iphethini yakho yokuvula ukuqinisekisa ukwenza kabusha idatha yonkampani."</string>
@@ -930,10 +954,10 @@
     <string name="call_settings_title" msgid="5188713413939232801">"Izilungiselelo zekholi"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Imodemu nge-USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Indawo ephathekayo"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"I-hotspot ephathekayo"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Imodemu nge-Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ukusebenzisa njengemodemu"</string>
-    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ukusebenzisa njengemodemu &amp; indawo ephathekayo"</string>
+    <string name="tether_settings_title_all" msgid="8356136101061143841">"Ukusebenzisa njengemodemu &amp; i-hotspot ephathekayo"</string>
     <string name="usb_title" msgid="7483344855356312510">"I-USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Imodemu nge-USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"I-USB ixhunyiwe, hlola ukusebenzisa njengemodemu"</string>
@@ -956,10 +980,10 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Usizo"</string>
     <string name="network_settings_title" msgid="7967552516440151852">"Amanethiwekhi eselula"</string>
     <string name="location_title" msgid="1029961368397484576">"Indawo Yami"</string>
-    <string name="location_network_based" msgid="7472814266821714527">"I-Wi-Fi nendawo yenethiwekhi yeselula"</string>
+    <string name="location_network_based" msgid="9134175479520582215">"I-Wi-Fi nendawo yenethiwekhi 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="7457348712272184793">"Indawo itholwe i-Wi-Fi"</string>
-    <string name="location_gps" msgid="8392461023569708478">"amasethalayithi e-GPS"</string>
+    <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Indawo etholwe i-Wi-Fi"</string>
+    <string name="location_gps" msgid="8392461023569708478">"Amasethalayithi e-GPS"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"Vumela izinhlelo zokusebenza ukusebenzisa i-GPS kuthebhulethi yakho ukukhomba indawo yakho"</string>
     <string name="location_street_level" product="default" msgid="4617445745492014203">"Vumela izinhlelo zokusebenza ukusebenzisa i-GPS efonini yakho ukukhomba indawo yakho"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Sebenzisa ama-GPS asiziwe"</string>
@@ -1024,7 +1048,7 @@
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Shintsha iphathini yokuvula"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Udweba kanjani phathini yokuvula"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts_header" msgid="819903817323783498">"Kunemizamo engalungile eminingi kakhulu!"</string>
-    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Zama futhi emaminithini angu- <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="lockpattern_too_many_failed_confirmation_attempts_footer" msgid="6759029360597122873">"Zama futhi emasekhondini angu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
     <string name="activity_not_found" msgid="5551664692991605325">"Uhlelo lokusebenza alufakiwe efonini yakho."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Phatha izinhlelo zokusebenza"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Phatha futhi ukhiphe izinhlelo zokusebenza ezifakiwe"</string>
@@ -1083,8 +1107,9 @@
     <string name="filter" msgid="2018011724373033887">"Hlunga"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Khetha okukhethwa kukho kokuhlunga"</string>
     <string name="filter_apps_all" msgid="5142129378749391876">"Konke"</string>
+    <string name="filter_apps_disabled" msgid="5364447573326472890">"Kukhutshaziwe"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Landiwe"</string>
-    <string name="filter_apps_running" msgid="7767071454371350486">"Iyasebenza"</string>
+    <string name="filter_apps_running" msgid="7767071454371350486">"Sebenzayo"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Isitoreji se-USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Ekhadini le-SD"</string>
     <string name="disabled" msgid="9206776641295849915">"Akusebenzi"</string>
@@ -1148,6 +1173,9 @@
     <string name="app_special_disable_dlg_text" msgid="3447657419284854195">"Uma ukhubaza uhlelo lokusebenza olakhelwe phakathi, ezinye izinhlelo zokusebenza zingahle zingaziphathi kahle. Idatha yakho nayo izosuswa."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Cima izaziso?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Uma ucima izaziso kulolu hlelo lokusebenza, ungageja izaziso nezibuyekezo ezibalulekile."</string>
+    <string name="app_ops_settings" msgid="5108481883575527511">"Imisebenzi yohlelo lokusebenza"</string>
+    <string name="app_ops_running" msgid="7706949900637284122">"Sebenzayo"</string>
+    <string name="app_ops_never_used" msgid="9114608022906887802">"(Ayikaze yasetshenziswa)"</string>
     <string name="storageuse_settings_title" msgid="5657014373502630403">"Ukusetshensiswa kwesitoreji"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Buka okokulonda okusetshenziswa izinsiza"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Amasevisi asebenzayo"</string>
@@ -1159,13 +1187,13 @@
     <!-- no translation found for service_client_name (4037193625611815517) -->
     <skip />
     <string name="service_background_processes" msgid="6844156253576174488">"<xliff:g id="MEMORY">%1$s</xliff:g> vulekile"</string>
-    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> isetshenzisiwe"</string>
+    <string name="service_foreground_processes" msgid="7583975676795574276">"<xliff:g id="MEMORY">%1$s</xliff:g> sebenzile"</string>
     <string name="memory" msgid="6609961111091483458">"i-RAM"</string>
     <!-- no translation found for service_process_name (4098932168654826656) -->
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"Umsebenzisi: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"Umsebenzisi osusiwe"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> inqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> inqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> amasevisi"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> namasevisi"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo kanye <xliff:g id="NUMSERVICES">%2$d</xliff:g> nensizakalo"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> izinqubo <xliff:g id="NUMSERVICES">%2$d</xliff:g> namasevisi"</string>
@@ -1185,8 +1213,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"Misa isevisi yesistimu?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"Uqinisekile ukuthi ufuna ukumisa le sevisi yesistimu? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Uqinisekile ukuthi ufuna ukumisa le sevisi yesistimu? Uma kunjalo, ezinyeizici zethebhulethi yakho zingase ziyeke ukusebenza kahle kuze kube yilapho uyivala noma uyivula futhi."</string>
-    <string name="language_settings" msgid="5292716747264442359">"Ulimi; nokufakwayo"</string>
-    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ulimi; nokufakwayo"</string>
+    <string name="language_settings" msgid="5292716747264442359">"Ulimi &amp; ukufakwa"</string>
+    <string name="language_keyboard_settings_title" msgid="243220021717425813">"Ulimi &amp; ukufakwa"</string>
     <string name="language_settings_category" msgid="2288258489940617043">"Izilungiselelo zolimi"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ikhibhodi &amp; izindlela zokufaka"</string>
     <string name="phone_language" msgid="8870144109924299673">"Ulimi"</string>
@@ -1227,6 +1255,8 @@
     <string name="user_dict_settings_add_word_option_name" msgid="7868879174905963135">"Igama:"</string>
     <string name="user_dict_settings_add_shortcut_option_name" msgid="660089258866063925">"Isinqamulelo:"</string>
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Ulimi:"</string>
+    <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Thayipha igama"</string>
+    <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Ukunqamulela okukhethekayo"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Hlela igama"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Hlela"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Susa"</string>
@@ -1267,8 +1297,10 @@
     <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"Izilungiselelo zokwakheka kwangampela kwekhibhodi"</string>
     <string name="development_settings_title" msgid="215179176067683667">"Izinketho Zonjiniyela"</string>
     <string name="development_settings_summary" msgid="1815795401632854041">"Setha okukhethwayo kwentuthuko yohlelo lokusebenza"</string>
+    <string name="development_settings_not_available" msgid="4308569041701535607">"Izinketho zonjiniyela azitholakali kulo msebenzisi"</string>
     <string name="enable_adb" msgid="7982306934419797485">"Ukulungisa iphutha le-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Lungisa iphutha lemodi lapho i-USB ixhunyiwe"</string>
+    <string name="clear_adb_keys" msgid="4038889221503122743">"Buyisa ukugunyaza kokususa iphutha le-USB"</string>
     <string name="bugreport_in_power" msgid="4548816486587403971">"Imibiko yeziphazamiso zenenyu yamandla"</string>
     <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Faka phakathi inketho kumenyu yamandla yokuthatha umbiko wesiphazamiso"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Hlala uphapheme"</string>
@@ -1277,6 +1309,7 @@
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</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>
     <string name="dev_settings_warning_title" msgid="7244607768088540165">"Vumele izilungiselelo zokuthuthukisa?"</string>
     <string name="dev_settings_warning_message" msgid="2298337781139097964">"Lezi zilungiselelo zenzelwe ukusetshenziswa ukuthuthukisa kuphela. Zingadala ukuthi idivayisi yakho kanye nensiza ekuyona ukuthi iphuke noma iziphathe kabi."</string>
     <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Qiniseka izinhlelo zokusebenza nge-USB"</string>
@@ -1318,26 +1351,21 @@
     <string name="accessibility_toggle_screen_magnification_preference_title" msgid="2472285215737820469">"Isisondezi-skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"Buyekeza ngokuzenzakalela isisondezi-skrini"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Buyekeza isisondezi-skrini ekushintshweni kohlelo lokusebenza"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Inkinobho yamandla imisa ikholi"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Inkinobho yamandla ivala ikholi"</string>
     <string name="accessibility_toggle_speak_password_preference_title" msgid="5986628515113204844">"Memeza iphasiwedi"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Thinta futhi ukulibazisa"</string>
-    <string name="accessibility_toggle_script_injection_preference_title" msgid="7950932054266694403">"Thuthukisa ukufinyelelwa kwewebhu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Izilungiselelo"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Kuyakhanya"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Vuliwe"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Kucishile"</string>
-    <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Kuvumelekile"</string>
-    <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Akuvumelekile"</string>
-    <string name="accessibility_script_injection_button_allow" msgid="2201503285877102870">"Vumela"</string>
-    <string name="accessibility_script_injection_button_disallow" msgid="5697152768523270885">"Unavumeli"</string>
-    <string name="accessibility_service_security_warning_title" msgid="5421628151509995404">"Sebeenzisa <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_security_warning_summary" product="tablet" msgid="8558441850832543571">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ingaqoqa wonke umbhalo owubhalayo, ngaphandle kwamaphasiwedi. Lokhu kuhlanganisa idatha yomuntu siqu enjengezinombolo zekhadi lesikoloto. Ingase futhi iqoqe idatha emayelana nokusebenzisana kwakho nedivaysi."</string>
-    <string name="accessibility_service_security_warning_summary" product="default" msgid="2869015914319424723">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> ingaqoqa wonke umbhalo owubhalayo, ngaphandle kwamaphasiwedi. Lokhu kuhlanganisa idatha yomuntu siqu enjengezinombolo zekhadi lesikoloto. Ingase futhi iqoqe idatha emayelana nokusebenzisana kwakho nedivaysi."</string>
-    <string name="accessibility_service_disable_warning_title" msgid="3393956845814484859">"Misa <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="accessibility_service_disable_warning_summary" msgid="625013894287895398">"ukuthinta LUNGILE kuyomisa <xliff:g id="SERVICE">%1$s</xliff:g>."</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="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Qapha izenzo zakho"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="2095111008854376237">"Thola izaziso lapho uhlanganyela nohlelo lokusebenza."</string>
+    <string name="disable_service_title" msgid="3624005212728512896">"Misa i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="disable_service_message" msgid="2012273739481042318">"Ukuthinta KULUNGILE kuzomisa i-<xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ayikho isevisi efakiwe"</string>
     <string name="accessibility_service_no_apps_title" msgid="5124097563864109821">"Udinga isifundi skrini?"</string>
     <string name="accessibility_service_no_apps_message" msgid="7751662416377046539">"I-TalkBack inikeza usizo lokuphendula kwezi ukuze kusizakale abangaboni kanye nalabo ababona kancane. Ingabe uyafuna ukuyifaka mahhala uyithola Emaketheni ye-Android?"</string>
-    <string name="accessibility_script_injection_security_warning_summary" msgid="7706858873495386310">"Ingabe ukuthi insiza ifake imibhalo ye-Google ezokwenza ukuthi okuqukethwe kwabo kutholakale kalula?"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Akukho ncazelo enikeziwe."</string>
     <string name="settings_button" msgid="3006713718908152930">"Izilungiselelo"</string>
     <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
@@ -1351,14 +1379,14 @@
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Iyashaja"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Isikrini sivuliwe"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"i-GPS ivuliwe"</string>
-    <string name="battery_stats_wifi_running_label" msgid="3093545080361658269">"I-Wi-Fi"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"I-Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"Phaphama"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isiginali yenethiwekhi yefoni"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
     <string name="awake" msgid="387122265874485088">"Isikhathi sokuvuka kwedivaysi"</string>
-    <string name="wifi_on_time" msgid="6310209835617490616">"i-Wi-Fi isesikhathini"</string>
-    <string name="bluetooth_on_time" msgid="6157799524996162271">"i-Wi-Fi isesikhathini"</string>
+    <string name="wifi_on_time" msgid="3208518458663637035">"I-Wi-Fi isesikhathini"</string>
+    <string name="bluetooth_on_time" msgid="3056108148042308690">"I-Wi-Fi isesikhathini"</string>
     <string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> -  <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Imininingwane yomlando"</string>
     <string name="details_title" msgid="3792801565213935385">"Sebenzisa imininingwane"</string>
@@ -1366,7 +1394,7 @@
     <string name="controls_subtitle" msgid="390468421138288702">"Lungisa amandla okusebenza"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Amaphakheji ahlanganisiwe"</string>
     <string name="power_screen" msgid="3023346080675904613">"Isikrini"</string>
-    <string name="power_wifi" msgid="2382791137776486974">"I-Wi-Fi"</string>
+    <string name="power_wifi" msgid="1135085252964054957">"I-Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"I-Bluetooth"</string>
     <string name="power_cell" msgid="6596471490976003056">"Iseli elindile"</string>
     <string name="power_phone" msgid="5392641106474567277">"Amakholi ezwi"</string>
@@ -1376,7 +1404,7 @@
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"Ingaphambili le-CPU"</string>
     <string name="usage_type_wake_lock" msgid="5125438890233677880">"Gcina kuphapheme"</string>
     <string name="usage_type_gps" msgid="7989688715128160790">"I-GPS"</string>
-    <string name="usage_type_wifi_running" msgid="8234997940652067049">"i-Wi-Fi iyasebenza"</string>
+    <string name="usage_type_wifi_running" msgid="3134357198266380400">"I-Wi-Fi iyasebenza"</string>
     <string name="usage_type_phone" product="tablet" msgid="262638572890253393">"Ithebhulethi"</string>
     <string name="usage_type_phone" product="default" msgid="9108247984998041853">"Ifoni"</string>
     <string name="usage_type_data_send" msgid="2857401966985425427">"Idatha ithunyelwe"</string>
@@ -1389,17 +1417,17 @@
     <string name="battery_action_app_details" msgid="7861051816778419018">"Ulwazi lohlelo lokusebenza"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Izilungiselelo zohlelo lokusebenza"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Izilungiselelo zeskrini"</string>
-    <string name="battery_action_wifi" msgid="2272741639606146903">"Izilungiselelo ze-Wi-Fi"</string>
+    <string name="battery_action_wifi" msgid="8181553479021841207">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Izilungiselelo ze-Bluetooth"</string>
-    <string name="battery_desc_voice" msgid="8980322055722959211">"Ibhetri esebenziswe izincingo zezwi"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Ibhetri esebenziswe amakholi wezwi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Ibhetri esebenziswe lapho ithebhulethi ingenzi lutho"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Ibhetri esebenziswe lapho ifoni ingenzi lutho"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Ibhetri esetshenziswe umsakazo weseli"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Shintshela kwimodi yendiza ukulondoloza amandla ezindaweni ezingenayo inethiwekhi yeseli."</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Ibhetri isebenziswa ukubukeka nokukhanya kwasemuva"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Yehlisa ukukhanya kwesikrini futhi/noma ukuphela kwesikhathi sesikrini"</string>
-    <string name="battery_desc_wifi" msgid="1702486494565080431">"Ibhetri esebenziswe i-Wi-Fi"</string>
-    <string name="battery_sugg_wifi" msgid="2085605314976704287">"Vala i-Wi-Fi lapho uyisebenzisa noma lapho ingatholakali"</string>
+    <string name="battery_desc_wifi" msgid="2375567464707394131">"Ibhethri elisetshenziswe i-Wi-Fi"</string>
+    <string name="battery_sugg_wifi" msgid="3355461362094706957">"Vala i-Wi-Fi uma ungayisebenzisi noma uma ingatholakali"</string>
     <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Ibhetri isebenziswe i-bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="1942935021750897422">"Vula i-bluetooth lapho ungayisebenzisi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Zama ukuxhuma kwidivaysi ye-Bluetooth ehlukile"</string>
@@ -1422,7 +1450,7 @@
     <string name="recognizer_title" msgid="3231385184559054457">"Isiqapheli sezwi"</string>
     <string name="recognizer_settings_title" msgid="432493301215113154">"Ukusesha Ngezwi"</string>
     <string name="recognizer_settings_summary" msgid="4472287934134546902">"Izilungiselelo ze- \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Umbhalo wezilungiselelo zamagama"</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Izilungiselelo zombhalo-kuya-kunkulumo"</string>
     <string name="tts_settings_title" msgid="1237820681016639683">"Umbhalo-uya-kokukhishwa ngokukhuluma"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Sebenzisa njalo izilungiselelo zami"</string>
     <string name="use_default_tts_settings_summary" msgid="5916421806783703823">"Izilungiselelo ezizenzakalelayo ngenzansi kwezilungiselelo zohlelo lokusebenza"</string>
@@ -1445,6 +1473,7 @@
     <string name="tts_engine_error_config" msgid="5820525416624637313">"Misa"</string>
     <string name="tts_engine_error_reselect" msgid="2415399149293842112">"Khetha enye injini"</string>
     <string name="tts_engine_security_warning" msgid="8786238102020223650">"Lenjini yokuqaphela amagama ingase ikwazi ukuqoqa wonke umbhalo ozokhulunywa, kuhlanganise idatha yomuntu siqu njengamaphasiwedi nezinombolo zekhadi lesikoloto. Iphuma <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> kwinjini. Vumela ukusebenzisa lenjini yokuqaphela amagama?"</string>
+    <string name="tts_engine_network_required" msgid="1190837151485314743">"Lolu limi ludinga ukuxhumana okusebenzayo kwenethiwekhi ekukhishweni kokuthunyelwe njengombhalo kunkulumo."</string>
     <string name="tts_engines_section" msgid="7515470972378742429">"Izinjini"</string>
     <string name="tts_engine_name_settings" msgid="4974538563074395920">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> izilungiselelo"</string>
     <string name="tts_engine_name_is_enabled_summary" msgid="4909484006804022115">"<xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> ivunyelwe"</string>
@@ -1462,14 +1491,14 @@
     <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Injini eyintandokazi"</string>
     <string name="tts_general_section_title" msgid="4402572014604490502">"Okuvamile"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Ukulawula Amandla"</string>
-    <string name="gadget_toggle_wifi" msgid="2382963973155082629">"Ibuyekeza ilungiselelo le-Wi-Fi"</string>
+    <string name="gadget_toggle_wifi" msgid="319262861956544493">"Ibuyekeza isilungiselelo se-Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Ibuyekeza ilungiselelo le-Bluetooth"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="gadget_state_on" msgid="6909119593004937688">"vuliwe"</string>
     <string name="gadget_state_off" msgid="5220212352953066317">"valiwe"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"iyakhanyisa"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"Iyavala"</string>
-    <string name="gadget_wifi" msgid="5960290421313061434">"I-Wi-Fi"</string>
+    <string name="gadget_wifi" msgid="4712584536500629417">"I-Wi-Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"I-Bluetooth"</string>
     <string name="gadget_gps" msgid="1558173602059236567">"i-GPS"</string>
     <string name="gadget_sync" msgid="858895763714222152">"Vumelanisa"</string>
@@ -1488,6 +1517,9 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string>
+    <string name="credential_storage_type" msgid="8629968543494001364">"Uhlobo lwesitoreji"</string>
+    <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
+    <string name="credential_storage_type_software" msgid="4403117271207715378">"Isofthiwe kuphela"</string>
     <string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string>
     <string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
     <string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1504,12 +1536,12 @@
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kumele usethe iphinikhodi noma iphasiwedi yokukhiya isikrini ngaphambi kokusebenzisa ukugcina kokuqinisekisa."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ithoni ephuthumayo"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
-    <string name="privacy_settings" msgid="5446972770562918934">"Sekela ngokulondoloza usethe kabusha"</string>
-    <string name="privacy_settings_title" msgid="4856282165773594890">"Sekela ngokulondoloza usethe kabusha"</string>
+    <string name="privacy_settings" msgid="5446972770562918934">"Yenza isipele &amp; usethe kabusha"</string>
+    <string name="privacy_settings_title" msgid="4856282165773594890">"Yenza isipele &amp; usethe kabusha"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Isipele &amp; buyisela esimweni"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Idatha yomuntu siqu"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sekela ngokulondoloza idatha yami"</string>
-    <string name="backup_data_summary" msgid="9157861529438245957">"Sekela ngokulondoloza idatha yohlelo lokusebenza, amaphasiwedi e-Wi-Fi, nezinye izilungiselelo kwiseva ye-Google"</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="auto_restore_title" msgid="5397528966329126506">"Ukubuyisela esimweni okuzenzakalelayo"</string>
@@ -1521,7 +1553,7 @@
     <string name="local_backup_password_toast_confirmation_mismatch" msgid="3495167398824569524">"Iphasiwedi entsha nokuqinisekisa akufani"</string>
     <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Ukungaphumeleli kokusetha iphasiwedi eyisipele"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="7218566008912418809">"Yeka ukulondoloza amaphasiwedi akho e-Wi-Fi, amabhukumaka, ezinye izilungiselelo, kanye nemininingwne yensinhlelo zokusebenza, uphinde ususe wonke amakhophi kwiseva ye-Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Yeka ukulondoloza amaphasiwedi akho e-Wi-Fi, amabhukhimaki, ezinye izilungiselelo, kanye nedatha yezinhlelo zokusebenza, nokususa onke amakhophi kumaseva we-Google?"</string>
     <string name="device_admin_settings_title" msgid="1335557832906433309">"Izilungiselelo zomphathi wedivaysi"</string>
     <string name="active_device_admin_msg" msgid="6930903262612422111">"Umphathi wedivaysi"</string>
     <string name="remove_device_admin" msgid="3596845261596451437">"Ungenzi kusebenze"</string>
@@ -1537,10 +1569,10 @@
     <string name="sound_category_notification_title" msgid="3502115998790286943">"Izaziso"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Ithoni yokukhala yekholi nokudlidliza"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Isistimu"</string>
-    <string name="wifi_setup_title" msgid="661074868726906436">"Ukumisa i-Wi-Fi"</string>
-    <string name="wifi_setup_title_editing_network" msgid="7304321031985059969">"Xhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
-    <string name="wifi_setup_title_connecting_network" msgid="3747859666621319757">"Ixhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
-    <string name="wifi_setup_title_connected_network" msgid="209755856836003839">"Ixhunywe kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title" msgid="2970260757780025029">"Ukusetha i-Wi-Fi"</string>
+    <string name="wifi_setup_title_editing_network" msgid="6020614644556717979">"Xhuma kwinethiwekhi ye-Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
+    <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Ixhuma kwinethiwekhi ye-Wi-Fi<xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
+    <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Engeza inethiwekhi"</string>
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Akuxhunyiwe"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Yengeza inethiwekhi"</string>
@@ -1562,9 +1594,9 @@
     <string name="wifi_setup_status_connecting" msgid="4971421484401530740">"Iyaxhuma kwi-inthanethi..."</string>
     <string name="wifi_setup_status_proceed_to_next" msgid="6708250000342940031">"Iya kwisinyathelo esilandelayo"</string>
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"I-EAP ayisekelwa"</string>
-    <string name="wifi_setup_eap_not_supported" msgid="595556546597351489">"Awukwazi ukumisa uxhumano lwe-EAP Wi-Fi phakathi nokuhlela. Emva kokuhlela, ungenza kanjalo ngaphansi kokuthi Izilungiselelo ngaphansi kokuthi Amanethiwekhi Nokungenantambo"</string>
-    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Ukuxhuma kungathatha imizuzu embalwa..."</string>
-    <string name="wifi_setup_description_connected" msgid="5235991893829582459">"Thinta"<b>"Okulandelayo"</b>" ukuqhubeka nokuhlela."\n\n"Thinta"<b>"Emuva"</b>"ukuxhuma kuhleloxhumano olwehlukile."</string>
+    <string name="wifi_setup_eap_not_supported" msgid="1955087534276570962">"Awukwazi ukulungiselela uxhumano lwe-EAP Wi-Fi phakathi nokusetha. Emva kokusetha, ungenza kanjalo kuzilungiselelo &gt; okungenazintambo namanethiwekhi"</string>
+    <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Ukuxhuma kungathatha amaminithi ambalwa..."</string>
+    <string name="wifi_setup_description_connected" msgid="736032046548460779">"Thinta"<b>"Okulandelayo"</b>" ukuqhubeka nokusetha."\n\n"Thinta"<b>"Emuva"</b>" ukuxhuma kuhleloxhumano olwehlukile."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ukunika amandla kuvumelanisiwe"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Ukuvumelanisa kukhubaziwe"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Iphutha lokuvumelanisa."</string>
@@ -1632,6 +1664,7 @@
     <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Uhlelo lokusebenza olulungiswe inkinga lulinda isilungisi senkinga ukuba sinamathisele ngaphambi kokuphuma"</string>
     <string name="debug_input_category" msgid="1811069939601180246">"Okufakwayo"</string>
     <string name="debug_drawing_category" msgid="6755716469267367852">"Umdwebo"</string>
+    <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Ukunikezelwa okusheshisiwe kwezingxenyekazi zekhompyutha"</string>
     <string name="debug_monitoring_category" msgid="7640508148375798343">"Ukwengamela"</string>
     <string name="strict_mode" msgid="1938795874357830695">"Imodi eqinile ivumelwe"</string>
     <string name="strict_mode_summary" msgid="142834318897332338">"Ukuphazimisa isikrini uma izinhlelo zokusebenza ziyenza umsebenzi ngesikhathi eside kuchungechunge olukhulu"</string>
@@ -1649,11 +1682,6 @@
     <string name="show_hw_overdraw_summary" msgid="4295714000923082647">"Kusuka kokuhle kuya kokubi kakhulu: okuluhlaza okwesibhakabhaka, okuluhlaza okotshani, okubomvu okukhanyayo, okubomvu"</string>
     <string name="disable_overlays" msgid="2074488440505934665">"Khubaza izimbondela ze-HW"</string>
     <string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
-    <string name="enable_traces_title" msgid="7448835465859512430">"Nika amandla ukuthola"</string>
-    <string name="enable_traces_dialog_title" msgid="5026490474669452929">"Khetha ukunika amandla ukuthola"</string>
-    <string name="enable_traces_summary_none" msgid="1867562808503494163">"Akukho ukuthola okwamanje okunikwe amandla"</string>
-    <string name="enable_traces_summary_num" msgid="8978230237777454269">"Ukuthola okungu-<xliff:g id="NUM">%1$d</xliff:g> okwamanje kunikwe amandla"</string>
-    <string name="enable_traces_summary_all" msgid="3950139649125158247">"Konke ukuthola okwamanje kunikwe amandla"</string>
     <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Nika amandla ukulandelwa komkhondo kwe-OpenGL"</string>
     <string name="debug_layout" msgid="5981361776594526155">"Khombisa imingcele yokumiseka"</string>
     <string name="debug_layout_summary" msgid="2001775315258637682">"Bonisa imikhawulo, imiphetho, njll, yesiqeshana."</string>
@@ -1663,8 +1691,8 @@
     <string name="force_hw_ui_summary" msgid="5535991166074861515">"Phoqelela ukusetshenziswa kwe-GPU ngomdwebo we-2d"</string>
     <string name="force_msaa" msgid="7920323238677284387">"Phoqelela i-4x MSAA"</string>
     <string name="force_msaa_summary" msgid="9123553203895817537">"Nika amandla i-4x MSAA ezinhlelweni zokusebenza ze-OpenGL ES 2.0"</string>
+    <string name="show_non_rect_clip" msgid="505954950474595172">"Susa iphutha ekusebenzeniokungekhona unxantathu kwesiqeshana"</string>
     <string name="track_frame_time" msgid="6146354853663863443">"Iphrofayela ye-GPU iyasebenzeka"</string>
-    <string name="track_frame_time_summary" msgid="447577515813970287">"Kala isikhathi sokusebenzeka ngama-adb shell dumpsys gfxinfo"</string>
     <string name="window_animation_scale_title" msgid="6162587588166114700">"Iwindi yesilinganisi sesithombe esinyakazayo"</string>
     <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>
@@ -1675,12 +1703,14 @@
     <string name="app_process_limit_title" msgid="4280600650253107163">"Isilinganiso senqubo yesithombe sanemuva"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"Bonisa wonke ama-ANR"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Boniso idayalogi Yohlelo Lokusebenza Olungasabeli kwizinhlelo zokusebenza zasemuva"</string>
+    <string name="experimental_webview" msgid="4492200819033780927">"Sebenzisa i-WebView yokuhlola"</string>
+    <string name="experimental_webview_summary" msgid="3431620080869482446">"Izinhlelo zokusebenza zizosebenzisa (beta) i-WebView entsha kunazo zonke"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Ukusebenzisa idatha"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Umjikelezo wokusebenza kwedatha"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Ukuzulazula kwedatha"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Gwema ukusetshenziswa kwedatha ngemuva"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Ukusetshenziswa okuseceleni kwe-4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="8266875319417201085">"Bonisa ukusebenza kwe-WiFi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="5056401102877964564">"Bonisa ukusebenza kwe-Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Bonisa ukusebenza kwe-Ethernet"</string>
     <string name="data_usage_menu_metered" msgid="5056695223222541863">"Izindawo ezikudonsela kuzo zeselula"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Vumelanisa ngokuzenzakalela idatha"</string>
@@ -1694,8 +1724,8 @@
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Setha umkhawulo wedatha yeselula"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Setha umkhawulo wedatha ye-4G"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"Setha umkhawulo wedatha ube ye-2G-3G"</string>
-    <string name="data_usage_disable_wifi_limit" msgid="8575537650560665657">"Setha umkhawulo wedatha ye-Wi-Fi"</string>
-    <string name="data_usage_tab_wifi" msgid="1728851922959017766">"Wi-Fi"</string>
+    <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Setha umkhawulo wedatha ye-Wi-Fi"</string>
+    <string name="data_usage_tab_wifi" msgid="481146038146585749">"I-Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
     <string name="data_usage_tab_mobile" msgid="454140350007299045">"Iselula"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
@@ -1726,9 +1756,9 @@
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="3893348029612821262">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngethebulethi yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="7962145861903746827">"Uxhumo lwedatha yakho yeselula luzokhubazwa uma umkhawulo ocacisiwe usufinyelelwe."\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngefoni yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, naka ukusebenzisa umkhawulo olandelanayo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Gwema ukusebenza kwedatha yangemuva?"</string>
-    <string name="data_usage_restrict_background" msgid="6387252645350792955">"Uma ugwema ukusetshenziswa kwedatha yangemuva kuselula, ezinye izinhlelo zokusebenza kanye namasevisi ngeke kusebense ngaphandle uma uxhumaniseke enethiwekhini ye-Wifi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="2609163428726042269">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
-    <string name="data_usage_restrict_background_multiuser" product="default" msgid="8025473178302056174">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
+    <string name="data_usage_restrict_background" msgid="8447934953579275363">"Uma ukhawulela idatha yeselula yokwangasemuva, ezinye izinhlelo zokusebenza kanye namasevisi ngeke kusebense ngaphandle uma uxhumeke kunethiwekhini ye-Wi-Fi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7132639594296036143">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
+    <string name="data_usage_restrict_background_multiuser" product="default" msgid="2642864376010074543">"Uma ukhawulela idatha yokwangasemuva, ezinye izinhlelo zokusebenza namasevisi ngeke kusebenze ngaphandle nje kokuthi uxhumeke kunethiekhi ye-Wi-Fi."\n\n"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"isexwayiso"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font><font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"umkhawulo"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Izinhlelo zokusebenza zisusiwe"</string>
@@ -1738,10 +1768,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="5961720793603268572">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>, njengoba kulinganiswe ithebhulethi yakho. Ukusetshenziswa kwedatha yenkampani yenethiwekhi yakho kungahluka."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="1625833170144610767">"<xliff:g id="RANGE">%2$s</xliff:g>: cishe kusetshenziswe okungu-<xliff:g id="TOTAL">%1$s</xliff:g>, njengoba kulinganiswe ifoni yakho. Ukusetshenziswa kwedatha yenkampani yenethiwekhi yakho kungahluka."</string>
     <string name="data_usage_metered_title" msgid="6204750602856383278">"Izindawo ezikudonsela kuzo zeselula"</string>
-    <string name="data_usage_metered_body" msgid="2446827764036316131">"Khetha amanethiwekhi e-Wi-Fi ayizindawo ezidonsela kuzo zeselula. Izinhlelo zokusebenza zingakhawulelwa ekusebenziseni lawo manethiwekhi uma angasemuva. Izinhlelo zokusebenza futhi zingahle zexwayise ngaphambi kokusebenzisa lawo manethiwekhi ngokulanda okukhulu."</string>
+    <string name="data_usage_metered_body" msgid="4959032833706695848">"Khetha amanethiwekhi e-Wi-Fi ayizindawo ezidonsela kuzo zeselula. Izinhlelo zokusebenza zingakhawulelwa ekusebenziseni lawo manethiwekhi uma angasemuva. Izinhlelo zokusebenza futhi zingahle zexwayise ngaphambi kokusebenzisa lawo manethiwekhi ngokulanda okukhulu."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Amanethiwekhi eselula"</string>
-    <string name="data_usage_metered_wifi" msgid="4151511616349458705">"Amanethiwekhi e-Wi-Fi"</string>
-    <string name="data_usage_metered_wifi_disabled" msgid="7566012564261138417">"Ukuze ukhethe izindawo ezikudonsela kuzo zeselula, khanyisa i-Wi-Fi."</string>
+    <string name="data_usage_metered_wifi" msgid="8540872226614404873">"Amanethiwekhi e-Wi-Fi"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="5502020778468643732">"Ukuze ukhethe izindawo ezikudonsela kuzo zeselula, vula i-Wi-Fi."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Ikholi ephuthmayo"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Buyela ekholini"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Igama"</string>
@@ -1799,34 +1829,50 @@
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Kunemvume"</string>
     <string name="selinux_status_enforcing" msgid="2252703756208463329">"Ukuphoqelela"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Abasebenzisi"</string>
-    <string name="user_you_section" msgid="6247838798859425408">"Wena"</string>
-    <string name="user_list_title" msgid="8866161687358773982">"Abanye abasebenzisi"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Engeza umsebenzisi"</string>
-    <string name="user_summary_active" msgid="4740649452346004418">"Kuyasebenza"</string>
-    <string name="user_summary_inactive" msgid="3758296246095054572">"Akusebenzi"</string>
+    <string name="user_list_title" msgid="7937158411137563543">"Abasebenzisi namaphrofayela"</string>
+    <string name="user_add_user_menu" msgid="3154537325132012954">"Engeza umsebenzisi noma iphrofayela"</string>
+    <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Iphrofayela evinjelwe"</string>
+    <string name="user_need_lock_message" msgid="2596365678651842785">"Ngaphambi kokuthi ungadala iphrofayela ekhawulelwe, kuzomele usethe ukukhiya isikrini ukuze uvikele izinhlelo zakho zokusebenza nedatha yakho yomuntu siqu."</string>
+    <string name="user_set_lock_button" msgid="8311219392856626841">"Setha ukukhiya"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"Akukho ukusetha"</string>
+    <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"Akusethiwe - Iphrofayela evinjelwe"</string>
     <string name="user_owner" msgid="3879126011135546571">"Umnikazi"</string>
+    <string name="user_you" msgid="1639158809315025986">"Wena (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"Isidlaliso"</string>
+    <string name="user_add_user_type_title" msgid="2146438670792322349">"Engeza"</string>
+    <string name="user_add_user_item_summary" msgid="4702776187132008661">"Abasebenzisi banezinhlelo zabo zokusebenza nokuqukethwe"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Ungakhawulela ukufinyelela kuzinhlelo zokusebenza nokuqukethwe kusukela ku-akhawunti yakho"</string>
+    <string name="user_add_user_item_title" msgid="8212199632466198969">"Umsebenzisi"</string>
+    <string name="user_add_profile_item_title" msgid="8353515490730363621">"Iphrofayela evinjelwe"</string>
     <string name="user_add_user_title" msgid="3961861593718285403">"Engeza umsebenzisi omusha"</string>
-    <string name="user_add_user_message_long" msgid="2278524063301283723">"Ungaba le divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, lapha angenza khona ngezifiso izinhlelo zakhe zokusebenza, isithombe sangemuva, nokunye. Abasebenzisi futhi balungisa izilungiselelo ze-tablet njenge-Wi-Fi ethinta wonke umuntu."\n\n"Ngemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha."\n\n"Noma imuphi umsebenzisi angabuyekeza izimvume zohlelo lokusebenza engxenyeni yabo bonke abanye abasebenzisi."</string>
+    <string name="user_add_user_message_long" msgid="3086244205384741788">"Ungabelana ngale divayisi nabanye abantu ngokudala abasebenzisi abangeziwe. Umsebenzisi ngamunye unesikhala sakhe, lapha angenza khona ngezifiso izinhlelo zakhe zokusebenza, isithombe sangemuva, nokunye. Abasebenzisi futhi balungisa izilungiselelo zethebhulethi njenge-Wi-Fi ethinta wonke umuntu."\n\n"Ngemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha."\n\n"Noma imuphi umsebenzisi angabuyekeza izimvume zohlelo lokusebenza engxenyeni yabo bonke abanye abasebenzisi."</string>
     <string name="user_add_user_message_short" msgid="3310933423737035428">"Ngemva kokudala umsebenzisi omusha, loyo muntu udinga ukwenza inqubo yokusetha."\n\n"Noma imuphi umsebenzisi angamukela izimvume zohlelo lokusebenza ezibuyekeziwe engxenyeni yabo bonke abanye abasebenzisi."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Setha umsebenzisi manje?"</string>
     <string name="user_setup_dialog_message" msgid="614037943337008555">"Qiniseka ukuthi umuntu uyatholakala ukuthatha ithebulethi futhi asethe isikhala sakhe"</string>
+    <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Setha iphrofayela manje?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Setha manje"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Hhayi manje"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Umnikazi wethebhulethi kuphela ongaphatha abasebenzisi"</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Umnikazi wefoni kuphela ongaphatha abasebenzisi."</string>
+    <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Amaphrofayela akhawulelwe awakwazi ukungeza ama-akhawunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Susa i-<xliff:g id="USER_NAME">%1$s</xliff:g> kule divayisi"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Umsebenzisi omusha"</string>
+    <string name="user_new_profile_name" msgid="2632088404952119900">"Iphrofayela entsha"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Zisuse wena?"</string>
     <string name="user_confirm_remove_title" msgid="3856148232937245711">"Susa umsebenzisi?"</string>
+    <string name="user_profile_confirm_remove_title" msgid="7399928935979459016">"Susa iphrofayela?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="8167855311779740207">"Uzolahlekelwa yisikhala sakho nedatha kule thebhulethi. Awukwazi ukuhlehlisa lesi senzo."</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="5391888073786090274">"Uzolahlekelwa yisikhala sakho nedatha kule foni. Awukwazi ukuhlehlisa lesi senzo."</string>
     <string name="user_confirm_remove_message" product="tablet" msgid="4610106937214870034">"Lesi sikhala somsebenzisi nedatha kuzonyamalala kule thebhulethi. Ungahlehlisa lesi senzo."</string>
     <string name="user_confirm_remove_message" product="default" msgid="8130264611683731142">"Lesi sikhala somsebenzisi nedatha kuzonyamalala kule foni. Ungahlehlisa lesi senzo."</string>
+    <string name="user_profile_confirm_remove_message" product="tablet" msgid="3071489858733409187">"Lesi sikhala sephrofayela nedatha kuzonyamalala kule thebhulethi. Ungahlehlisa lesi senzo."</string>
+    <string name="user_profile_confirm_remove_message" product="default" msgid="7078238859138335893">"Lesi sikhala ssephrofayela nedatha kuzonyamalala kule foni. Ungahlehlisa lesi senzo."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Ingeza umsebenzisi omusha…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Susa umsebenzisi"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Susa"</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>
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"Lesi silungiselelo sithinta bonke abasebenzisi kule thebulethi."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"Lesi silungiselelo sithinta bonke abasebenzisi kule foni."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"Shintsha ulimi"</string>
@@ -1837,4 +1883,25 @@
     <string name="user_picture_title" msgid="7297782792000291692">"I-ID yesithombe"</string>
     <string name="cell_broadcast_settings" msgid="8415582011920085222">"Ukusakazwa kweselula"</string>
     <string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Khetha izinhlobo zezaziso zesimo esiphuthumayo ongazibonisa."</string>
+    <string name="user_restrictions_title" msgid="7745810037152772035">"Imikhawulo yohlelo lokusebenza nokuqukethwe"</string>
+    <string name="user_rename" msgid="8523499513614655279">"QAMBA KABUSHA"</string>
+    <string name="app_restrictions_custom_label" msgid="4171895848817279538">"Setha imikhawulo yohlelo lokusebenza"</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="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>
+    <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Vumela ukushintshwa kokubhanqwa kwe-Bluetooth nezilungiselelo"</string>
+    <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"I-NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Vumela ukushintshanisa kwedatha uma ithebulethi ithinta enye idivayisi"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Vumela ukushintshanisa kwedatha uma ifoni ithinta enye idivayisi"</string>
+    <string name="restriction_location_enable_title" msgid="8134436816263688497">"Ukufinyelela kwendawo"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Vumela izinhlelo zokusebenza ukuthi zisebenzise ulwazi lendawo yakho"</string>
+    <string name="wizard_back" msgid="5567007959434765743">"Phindela emuva"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Okulandelayo"</string>
+    <string name="wizard_finish" msgid="3286109692700083252">"Qeda"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"Thatha isithombe"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"Khetha isithombe kusuka kugalari"</string>
+    <string name="regulatory_info_text" msgid="5623087902354026557"></string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 6c24503..1a11ebb 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -76,7 +76,7 @@
         <!-- Do not translate. -->
         <item>1800000</item>
     </string-array>
-    
+
     <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
     <string-array name="dream_timeout_entries">
         <item>Never</item>
@@ -108,8 +108,8 @@
         <!-- Do not translate. -->
         <item>1800000</item>
     </string-array>
-    
-    <!-- Security settings.  The delay after screen is turned off until device locks. 
+
+    <!-- Security settings.  The delay after screen is turned off until device locks.
          These are shown in a list dialog. -->
     <string-array name="lock_after_timeout_entries">
         <item>Immediately</item>
@@ -144,7 +144,7 @@
         <!-- Do not translate. -->
         <item>1800000</item>
     </string-array>
-    
+
     <string-array name="entries_font_size">
         <item msgid="6490061470416867723">Small</item>
         <item msgid="3579015730662088893">Normal</item>
@@ -158,7 +158,7 @@
         <item>1.15</item>
         <item>1.30</item>
     </string-array>
-    
+
     <!-- TTS settings -->
 
     <!-- Default speech rate choices -->
@@ -167,7 +167,11 @@
         <item>Slow</item>
         <item>Normal</item>
         <item>Fast</item>
+        <item>Faster</item>
         <item>Very fast</item>
+        <item>Rapid</item>
+        <item>Very rapid</item>
+        <item>Fastest</item>
     </string-array>
     <!-- Do not translate. -->
     <string-array name="tts_rate_values">
@@ -176,6 +180,10 @@
         <item>100</item>
         <item>150</item>
         <item>200</item>
+        <item>250</item>
+        <item>300</item>
+        <item>350</item>
+        <item>400</item>
     </string-array>
 
     <!-- Default pitch choices -->
@@ -576,11 +584,89 @@
         <item>auto</item>
     </string-array>
 
+    <!-- Names of categories of app ops tabs -->
+    <string-array name="app_ops_categories">
+        <item>Location</item>
+        <item>Personal</item>
+        <item>Messaging</item>
+        <item>Device</item>
+    </string-array>
+
+    <!-- User display names for app ops codes -->
+    <string-array name="app_ops_summaries">
+        <item>coarse location</item>
+        <item>fine location</item>
+        <item>GPS</item>
+        <item>vibrate</item>
+        <item>read contacts</item>
+        <item>modify contacts</item>
+        <item>read call log</item>
+        <item>modify call log</item>
+        <item>read calendar</item>
+        <item>modify calendar</item>
+        <item>wi-fi scan</item>
+        <item>notification</item>
+        <item>cell scan</item>
+        <item>call phone</item>
+        <item>read SMS</item>
+        <item>write SMS</item>
+        <item>receive SMS</item>
+        <item>receive emergency SMS</item>
+        <item>receive MMS</item>
+        <item>receive WAP push</item>
+        <item>send SMS</item>
+        <item>read ICC SMS</item>
+        <item>write ICC SMS</item>
+        <item>modify settings</item>
+        <item>draw on top</item>
+        <item>access notifications</item>
+        <item>camera</item>
+        <item>record audio</item>
+        <item>play audio</item>
+        <item>read clipboard</item>
+        <item>modify clipboard</item>
+    </string-array>
+
+    <!-- User display names for app ops codes -->
+    <string-array name="app_ops_labels">
+        <item>Location</item>
+        <item>Location</item>
+        <item>Location</item>
+        <item>Vibrate</item>
+        <item>Read contacts</item>
+        <item>Modify contacts</item>
+        <item>Read call log</item>
+        <item>Modify call log</item>
+        <item>Read calendar</item>
+        <item>Modify calendar</item>
+        <item>Location</item>
+        <item>Post notification</item>
+        <item>Location</item>
+        <item>Call phone</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
+        <item>Modify settings</item>
+        <item>Draw on top</item>
+        <item>Access notifications</item>
+        <item>Camera</item>
+        <item>Record audio</item>
+        <item>Play audio</item>
+        <item>Read clipboard</item>
+        <item>Modify clipboard</item>
+    </string-array>
+
     <!-- Titles for the list of long press timeout options. -->
     <string-array name="long_press_timeout_selector_titles">
         <!-- A title for the option for short long-press timeout [CHAR LIMIT=25] -->
         <item>Short</item>
-        <!-- A title for the option for medium long-press timeout [CHAR LIMIT=25] -->        
+        <!-- A title for the option for medium long-press timeout [CHAR LIMIT=25] -->
         <item>Medium</item>
         <!-- A title for the option for long long-press timeout [CHAR LIMIT=25] -->
         <item>Long</item>
@@ -714,6 +800,36 @@
         <item>error</item>
     </string-array>
 
+    <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+    <string-array name="show_non_rect_clip_entries">
+        <item>Off</item>
+        <item>Draw non-rectangular clip region in blue</item>
+        <item>Highlight tested drawing commands in green</item>
+    </string-array>
+
+    <!-- Values for non-rectangular clipping preference. -->
+    <string-array name="show_non_rect_clip_values" translatable="false" >
+        <item>hide</item>
+        <item>region</item>
+        <item>highlight</item>
+    </string-array>
+
+    <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+    <string-array name="track_frame_time_entries">
+        <item>Off</item>
+        <item>On screen as bars</item>
+        <item>On screen as lines</item>
+        <item>In adb shell dumpsys gfxinfo</item>
+    </string-array>
+
+    <!-- Values for frame time tracking preference. -->
+    <string-array name="track_frame_time_values" translatable="false" >
+        <item>false</item>
+        <item>visual_bars</item>
+        <item>visual_lines</item>
+        <item>true</item>
+    </string-array>
+
     <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
     <string-array name="app_process_limit_entries">
         <item>Standard limit</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e7a00c3..bd385f6 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -37,4 +37,7 @@
     <color name="title_color">@android:color/holo_blue_light</color>
     <color name="setup_divider_color">#333333</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>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 91f293c..aa40096 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -61,4 +61,12 @@
     <dimen name="keyguard_appwidget_picker_margin_left">6dip</dimen>
     <dimen name="keyguard_appwidget_picker_margin_right">6dip</dimen>
     <integer name="keyguard_appwidget_picker_cols">1</integer>
+
+    <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>
+
+    <!-- Minimum width for the popup for updating a user's photo. -->
+    <dimen name="update_user_photo_popup_min_width">300dip</dimen>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index caca2b9..dbdec2d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -585,7 +585,7 @@
     <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
     <string name="wireless_networks_settings_title">Wireless &amp; networks</string>
     <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
-    <string name="radio_controls_summary">Manage Wi-Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>
+    <string name="radio_controls_summary">Manage Wi\u2011Fi, Bluetooth, airplane mode, mobile networks, &amp; VPNs</string>
 
     <!-- mobile network settings screen, setting check box title -->
     <string name="roaming">Data roaming</string>
@@ -679,6 +679,10 @@
     <string name="show_user_info_on_lockscreen_label">Show user info on lock screen</string>
     <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
     <string name="user_info_settings_title">User info</string>
+    <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+    <string name="show_profile_info_on_lockscreen_label">Show profile info on lock screen</string>
+    <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+    <string name="profile_info_settings_title">Profile info</string>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
     <string name="location_settings_title">Location access</string>
     <!-- Main Settings screen setting option title for the item to take you to the security screen -->
@@ -983,6 +987,37 @@
     <!-- Summary of preference to manage device policies -->
     <string name="manage_device_admin_summary">View or deactivate device administrators</string>
 
+    <!-- Notification access settings (part of Security) -->
+
+    <!-- Title of preference to manage notification listeners -->
+    <string name="manage_notification_access">Notification access</string>
+
+    <!-- Summary of preference to manage notification listeners, when none are enabled -->
+    <string name="manage_notification_access_summary_zero">Apps cannot read notifications</string>
+
+    <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+    <plurals name="manage_notification_access_summary_nonzero">
+        <item quantity="one">%d app can read notifications</item>
+        <item quantity="other">%d apps can read notifications</item>
+    </plurals>
+
+    <!-- String to show in the list of notification listeners, when none is installed -->
+    <string name="no_notification_listeners">No notification listeners are installed.</string>
+
+    <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+    <string name="notification_listener_security_warning_title">Enable
+         <xliff:g id="service" example="NotificationReader">%1$s</xliff:g>?</string>
+    <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+    <string name="notification_listener_security_warning_summary">
+        <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>
+
     <!-- Bluetooth settings -->
     <!-- Bluetooth settings check box title on Main Settings screen -->
     <string name="bluetooth_quick_toggle_title">Bluetooth</string>
@@ -1169,7 +1204,7 @@
     <!-- Wifi Display settings. Text displayed when Wifi display is off and device list is empty [CHAR LIMIT=80]-->
     <string name="wifi_display_settings_empty_list_wifi_display_off">To see devices, turn wireless display on.</string>
     <!-- Wifi Display settings. Text displayed when Wifi Display is off and device list is empty [CHAR LIMIT=80]-->
-    <string name="wifi_display_settings_empty_list_wifi_display_disabled">Wireless display is disabled because Wi-Fi is off.</string>
+    <string name="wifi_display_settings_empty_list_wifi_display_disabled">Wireless display is disabled because Wi\u2011Fi is off.</string>
     <!-- Wifi Display settings. The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
     <string name="wifi_display_search_for_devices">Search for displays</string>
     <!-- Wifi Display settings. The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
@@ -1239,23 +1274,23 @@
 
     <!-- Wi-Fi Settings --> <skip />
     <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
-    <string name="wifi_quick_toggle_title">Wi-Fi</string>
+    <string name="wifi_quick_toggle_title">Wi\u2011Fi</string>
     <!-- Used in the 1st-level settings screen as the turn-on summary -->
-    <string name="wifi_quick_toggle_summary">Turn on Wi-Fi</string>
+    <string name="wifi_quick_toggle_summary">Turn on Wi\u2011Fi</string>
     <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
-    <string name="wifi_settings">Wi-Fi</string>
+    <string name="wifi_settings">Wi\u2011Fi</string>
     <!-- Title of the Wi-fi settings screen -->
-    <string name="wifi_settings_category">Wi-Fi settings</string>
+    <string name="wifi_settings_category">Wi\u2011Fi settings</string>
     <!-- Title of the Wi-fi settings entry in the left top level menu -->
-    <string name="wifi_settings_title">Wi-Fi</string>
+    <string name="wifi_settings_title">Wi\u2011Fi</string>
     <!-- Summary text of the Wi-fi settings screen -->
     <string name="wifi_settings_summary">Set up &amp; manage wireless access points</string>
     <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
-    <string name="wifi_setup_wizard_title">Select Wi-Fi</string>
+    <string name="wifi_setup_wizard_title">Select Wi\u2011Fi</string>
     <!-- Summary text when turning Wi-Fi or bluetooth on -->
-    <string name="wifi_starting">Turning Wi-Fi on\u2026</string>
+    <string name="wifi_starting">Turning Wi\u2011Fi on\u2026</string>
     <!-- Summary text when turning Wi-Fi or bluetooth off -->
-    <string name="wifi_stopping">Turning off Wi-Fi\u2026</string>
+    <string name="wifi_stopping">Turning off Wi\u2011Fi\u2026</string>
     <!-- Summary text when Wi-Fi or bluetooth has error -->
     <string name="wifi_error">Error</string>
     <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
@@ -1269,19 +1304,29 @@
     <!-- Checkbox title for option to toggle poor network detection -->
     <string name="wifi_poor_network_detection">Avoid poor connections</string>
     <!-- Checkbox summary for option to toggle poor network detection -->
-    <string name="wifi_poor_network_detection_summary">Don\'t use a Wi-Fi network unless it has a good Internet connection</string>
+    <string name="wifi_poor_network_detection_summary">Don\'t use a Wi\u2011Fi network unless it has 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 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-Fi is off</string>
+    <!-- Preference title for option to install certificates -->
+    <string name="wifi_install_credentials">Install certificates</string>
+    <string name="wifi_scan_notify_text_location_on">To improve location accuracy and for other purposes, Google and other apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
+    <string name="wifi_scan_notify_text_location_off">Apps may scan for nearby networks, even when Wi-Fi is off. If you don\'t want this to happen, go to Advanced &gt; Scanning always available.</string>
+    <!-- Wifi scan always mode checkbox text -->
+    <string name="wifi_scan_notify_remember_choice">Don\'t show again</string>
     <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
-    <string name="wifi_setting_sleep_policy_title">Keep Wi-Fi on during sleep</string>
+    <string name="wifi_setting_sleep_policy_title">Keep Wi\u2011Fi on during sleep</string>
     <!-- Generic error message when the sleep policy could not be set. -->
     <string name="wifi_setting_sleep_policy_error">There was a problem changing the setting</string>
     <!-- Checkbox title for option to toggle suspend power optimizations -->
-    <string name="wifi_suspend_optimizations">Wi-Fi optimization</string>
+    <string name="wifi_suspend_optimizations">Wi\u2011Fi optimization</string>
     <!-- Checkbox summary for option to toggle suspend power optimizations -->
-    <string name="wifi_suspend_optimizations_summary">Minimize battery usage when Wi-Fi is on</string>
+    <string name="wifi_suspend_optimizations_summary">Minimize battery usage when Wi\u2011Fi is on</string>
     <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
     <string name="wifi_add_network">Add network</string>
     <!-- Header for the list of wifi networks-->
-    <string name="wifi_access_points">Wi-Fi networks</string>
+    <string name="wifi_access_points">Wi\u2011Fi networks</string>
     <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
     <string name="wifi_menu_wps_pbc">WPS Push Button</string>
     <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
@@ -1289,7 +1334,7 @@
     <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
     <string name="wifi_menu_wps_pin">WPS Pin Entry</string>
     <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
-    <string name="wifi_menu_p2p">Wi-Fi Direct</string>
+    <string name="wifi_menu_p2p">Wi\u2011Fi Direct</string>
     <!-- Menu option to scan Wi-Fi networks -->
     <string name="wifi_menu_scan">Scan</string>
     <!-- Menu option to Wi-Fi advanced settings -->
@@ -1301,9 +1346,11 @@
     <!-- Menu option to modify a Wi-Fi network configuration -->
     <string name="wifi_menu_modify">Modify network</string>
     <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
-    <string name="wifi_empty_list_wifi_off">To see available networks, turn Wi-Fi on.</string>
+    <string name="wifi_empty_list_wifi_off">To see available networks, turn Wi\u2011Fi on.</string>
     <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
-    <string name="wifi_empty_list_wifi_on">Searching for Wi-Fi networks\u2026</string>
+    <string name="wifi_empty_list_wifi_on">Searching for Wi\u2011Fi networks\u2026</string>
+    <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+    <string name="wifi_empty_list_user_restricted">You don\'t have permission to change the Wi\u2011Fi network.</string>
     <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
     <string name="wifi_other_network">Other network\u2026</string>
     <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
@@ -1311,23 +1358,23 @@
     <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
     <string name="wifi_setup_wps">Automatic setup (WPS)</string>
     <!-- Message informing that wifi is required during setup [CHAR LIMIT=NONE] -->
-    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi-Fi. After setup, you can switch between mobile data and Wi-Fi.</string>
+    <string name="wifi_required_info_text">To complete setup, your tablet needs access to Wi\u2011Fi. After setup, you can switch between mobile data and Wi\u2011Fi.</string>
 
     <!-- Dialog for Access Points --> <skip />
     <!-- Label to show/hide advanced options -->
     <string name="wifi_show_advanced">Show advanced options</string>
     <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
-    <string name="wifi_wps_setup_title">Wi-Fi Protected Setup</string>
+    <string name="wifi_wps_setup_title">Wi\u2011Fi Protected Setup</string>
     <!-- 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-Fi 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 contain 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-Fi router. The setup can take up to two minutes to complete.</string>
+    <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] -->
     <string name="wifi_wps_complete">WPS succeeded. Connecting to the network\u2026</string>
     <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
-    <string name="wifi_wps_connected">Connected to Wi-Fi network <xliff:g id="network_name">%s</xliff:g></string>
+    <string name="wifi_wps_connected">Connected to Wi\u2011Fi network <xliff:g id="network_name">%s</xliff:g></string>
     <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
     <string name="wifi_wps_in_progress">WPS is already in progress and can take up to two minutes to complete</string>
     <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
@@ -1342,6 +1389,8 @@
     <string name="wifi_wps_failed_overlap">Another WPS session was detected. Please try again in a few minutes.</string>
     <!-- Label for the SSID of the network -->
     <string name="wifi_ssid">Network SSID</string>
+    <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+    <string name="wifi_ssid_hint">Enter the SSID</string>
     <!-- Label for the security of the connection -->
     <string name="wifi_security">Security</string>
     <!-- Label for the signal strength of the connection -->
@@ -1429,6 +1478,9 @@
     <!-- 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>
+    <string name="wifi_scan_always_confirm_allow">Allow</string>
+    <string name="wifi_scan_always_confirm_deny">Deny</string>
 
     <!-- Button label to connect to a Wi-Fi network -->
     <string name="wifi_connect">Connect</string>
@@ -1445,28 +1497,28 @@
     <!-- Button label to dismiss the dialog -->
     <string name="wifi_cancel">Cancel</string>
     <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
-    <string name="wifi_skip_anyway" msgid="5205612884736051138">Skip anyway</string>
+    <string name="wifi_skip_anyway">Skip anyway</string>
     <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
     <string name="wifi_dont_skip">Don\'t skip</string>
 
     <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
-    <string name="wifi_skipped_message" product="tablet" msgid="6518433975501257341">WARNING: You may incur extra carrier data charges.\n\nTablet setup can require significant network activity.</string>
+    <string name="wifi_skipped_message" product="tablet">WARNING: You may incur extra carrier data charges.\n\nTablet setup can require significant network activity.</string>
     <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
-    <string name="wifi_skipped_message" product="default" msgid="4376150150678208848">WARNING: You may incur extra carrier data charges.\n\nPhone setup can require significant network activity.</string>
+    <string name="wifi_skipped_message" product="default">WARNING: You may incur extra carrier data charges.\n\nPhone setup can require significant network activity.</string>
     <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
-    <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="5647058314212144925">WARNING: The tablet won\'t be able to verify that your software is up to date.</string>
+    <string name="wifi_and_mobile_skipped_message" product="tablet">WARNING: Until you have an internet connection, the tablet won\'t be able to verify that your software is up to date.</string>
     <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
-    <string name="wifi_and_mobile_skipped_message" product="default" msgid="1288483646141987070">WARNING: The phone won\'t be able to verify that your software is up to date.</string>
+    <string name="wifi_and_mobile_skipped_message" product="default">WARNING: Until you have an internet connection, the phone won\'t be able to verify that your software is up to date.</string>
     <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
-    <string name="wifi_connect_failed_message" product="tablet" msgid="2006689630582761529">The tablet was unable to connect to this Wi-Fi network.</string>
+    <string name="wifi_connect_failed_message" product="tablet">The tablet was unable to connect to this Wi\u2011Fi network.</string>
     <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
-    <string name="wifi_connect_failed_message" product="default" msgid="8220901976514642385">The phone was unable to connect to this Wi-Fi network.</string>
+    <string name="wifi_connect_failed_message" product="default">The phone was unable to connect to this Wi\u2011Fi network.</string>
 
     <!-- Wi-Fi Advanced Settings --> <skip />
     <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. -->
-    <string name="wifi_advanced_titlebar">Advanced Wi-Fi</string>
+    <string name="wifi_advanced_titlebar">Advanced Wi\u2011Fi</string>
     <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
-    <string name="wifi_setting_frequency_band_title">Wi-Fi frequency band</string>
+    <string name="wifi_setting_frequency_band_title">Wi\u2011Fi frequency band</string>
     <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
     <string name="wifi_setting_frequency_band_summary">Specify the frequency range of operation</string>
     <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
@@ -1510,7 +1562,7 @@
 
     <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
     <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
-    <string name="wifi_p2p_settings_title">Wi-Fi Direct</string>
+    <string name="wifi_p2p_settings_title">Wi\u2011Fi Direct</string>
     <string name="wifi_p2p_device_info">Device information</string>
     <string name="wifi_p2p_persist_network">Remember this connection</string>
     <!-- Menu option to discover peers-->
@@ -1542,7 +1594,7 @@
 
     <!-- Wifi AP settings-->
     <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
-    <string name="wifi_tether_checkbox_text">Portable Wi-Fi hotspot</string>
+    <string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
     <!-- Summary text when turning hotspot on -->
     <string name="wifi_tether_starting">Turning hotspot on\u2026</string>
     <!-- Summary text when turning hotspot off -->
@@ -1550,11 +1602,11 @@
     <!-- Subtext for wifi tether checkbox on success -->
     <string name="wifi_tether_enabled_subtext">Portable hotspot <xliff:g id="network_ssid">%1$s</xliff:g> active</string>
     <!-- Subtext for wifi tether checkbox on failure -->
-    <string name="wifi_tether_failed_subtext">Portable Wi-Fi hotspot error</string>
+    <string name="wifi_tether_failed_subtext">Portable Wi\u2011Fi hotspot error</string>
     <!-- Used to open the ssid and security dialog for Wifi Access Point -->
-    <string name="wifi_tether_configure_ap_text">Set up Wi-Fi hotspot</string>
+    <string name="wifi_tether_configure_ap_text">Set up Wi\u2011Fi hotspot</string>
     <!-- Subtext on configuration preference to indicate SSID and security chosen -->
-    <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi-Fi hotspot</string>
+    <string name="wifi_tether_configure_subtext"><xliff:g id="network_ssid">%1$s</xliff:g> <xliff:g id="network_security">%2$s</xliff:g> portable Wi\u2011Fi hotspot</string>
     <!-- Default access point SSID used for tethering -->
     <string name="wifi_tether_configure_ssid_default">AndroidHotspot</string>
 
@@ -1927,7 +1979,7 @@
     <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
     <string name="status_operator">Network</string>
     <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
-    <string name="status_wifi_mac_address">Wi-Fi MAC address</string>
+    <string name="status_wifi_mac_address">Wi\u2011Fi MAC address</string>
     <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
     <string name="status_bt_address">Bluetooth address</string>
     <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
@@ -2286,11 +2338,11 @@
     <!-- Security & location settings screen, section header for settings relating to location -->
     <string name="location_title">My Location</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-Fi &amp; mobile network location</string>
+    <string name="location_network_based">Wi\u2011Fi &amp; mobile network location</string>
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
     <string name="location_neighborhood_level">Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google.</string>
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
-    <string name="location_neighborhood_level_wifi">Location determined by Wi-Fi</string>
+    <string name="location_neighborhood_level_wifi">Location determined by Wi\u2011Fi</string>
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
     <string name="location_gps">GPS satellites</string>
     <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
@@ -2569,6 +2621,8 @@
     <!-- Text for filter option in ManageApps screen to display all installed
     applications -->
     <string name="filter_apps_all">All</string>
+    <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+    <string name="filter_apps_disabled">Disabled</string>
     <!-- Text for filter option in ManageApps screen to display third party
     applications only -->
     <string name="filter_apps_third_party">Downloaded</string>
@@ -2702,6 +2756,14 @@
         If you turn off notifications for this app, you may miss important alerts and updates.
     </string>
 
+    <!-- App Ops Settings --> <skip />
+    <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+    <string name="app_ops_settings">App ops</string>
+    <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+    <string name="app_ops_running">Running</string>
+    <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+    <string name="app_ops_never_used">(Never used)</string>
+
     <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
     <string name="storageuse_settings_title">Storage use</string>
     <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
@@ -2893,6 +2955,10 @@
     <string name="user_dict_settings_add_shortcut_option_name">Shortcut:</string>
     <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
     <string name="user_dict_settings_add_locale_option_name">Language:</string>
+    <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_add_word_hint">Type a word</string>
+    <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+    <string name="user_dict_settings_add_shortcut_hint">Optional shortcut</string>
     <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
     <string name="user_dict_settings_edit_dialog_title">Edit word</string>
     <!-- User dictionary settings. The title of the context menu item to edit the current word -->
@@ -2980,9 +3046,13 @@
     <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
     <string name="development_settings_summary">Set options for app development</string>
     <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+    <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+    <string name="development_settings_not_available">Developer options are not available for this user</string>
     <string name="enable_adb">USB debugging</string>
     <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
     <string name="enable_adb_summary">Debug mode when USB is connected</string>
+    <!-- Setting title to revoke secure USB debugging authorizations -->
+    <string name="clear_adb_keys">Revoke USB debugging authorizations</string>
     <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
     <string name="bugreport_in_power">Power menu bug reports</string>
     <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
@@ -2999,6 +3069,8 @@
     <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>
+    <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+    <string name="adb_keys_warning_message">Revoke access to USB debugging from all computers you\'ve previously authorized?</string>
     <!-- Title of warning dialog about the implications of enabling developer settings -->
     <string name="dev_settings_warning_title">Allow development settings?</string>
     <!-- Warning text to user about the implications of enabling USB debugging -->
@@ -3110,8 +3182,6 @@
     <string name="accessibility_toggle_speak_password_preference_title">Speak passwords</string>
     <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
     <string name="accessibility_long_press_timeout_preference_title">Touch &amp; hold delay</string>
-    <!-- Title for accessibility preference to install accessibility scripts from Google. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_script_injection_preference_title">Enhance web accessibility</string>
 
     <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
     <string name="accessibility_menu_item_settings">Settings</string>
@@ -3121,40 +3191,24 @@
     <!-- Summary for the disabled state of an accessiblity feature. [CHAR LIMIT=10] -->
     <string name="accessibility_feature_state_off">Off</string>
 
-    <!-- Summary for the allowed state of script injection. [CHAR LIMIT=15] -->
-    <string name="accessibility_script_injection_allowed">Allowed</string>
-    <!-- Summary for the disallowed state of script injection. [CHAR LIMIT=15] -->
-    <string name="accessibility_script_injection_disallowed">Not allowed</string>
-
-    <!-- Title for the dialog button to allow script injection. [CHAR LIMIT=15] -->
-    <string name="accessibility_script_injection_button_allow">Allow</string>
-    <!-- Title for the dialog button to disallow script injection. [CHAR LIMIT=15] -->
-    <string name="accessibility_script_injection_button_disallow">Don\'t allow</string>
-
-     <!-- Title for a warning message about security implications of enabling an accessibility service,
-         displayed as a dialog message when the user selects to enable an accessibility service (tablet). [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_security_warning_title">Use
+    <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+    <string name="enable_service_title">Use
          <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
-    <!-- Summary for a warning message about security implications of enabling an accessibility service,
-         displayed as a dialog message when the user selects to enable an accessibility service (tablet). [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_security_warning_summary" product="tablet">
-            <xliff:g id="accessibility_service_name">%1$s</xliff:g> can
-            collect all of the text you type, except passwords. This includes personal data such as credit card
-            numbers. It can also collect data about your interactions with the tablet.</string>
-    <!-- Summary for a warning message about security implications of enabling an accessibility service,
-         displayed as a dialog message when the user selects to enable an accessibility service (phone). [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_security_warning_summary" product="default">
-            <xliff:g id="accessibility_service_name">%1$s</xliff:g> can
-            collect all of the text you type, except passwords. This includes personal data such as credit card
-            numbers. It can also collect data about your interactions with the phone.</string>
+    <!-- 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>
 
-    <!-- Title for a warning about disabling an accessibility service displayed as a dialog message when the user
-         selects to disable that service. This avoids accidental disabling. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_disable_warning_title">Stop
-         <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
-    <!-- Summary for a warning about disabling accessibility service displayed as a dialog message when the user
-         selects to disable that service. This avoids accidental disabling. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_disable_warning_summary">Touching OK will
+    <!-- Title for the capability of an accessibility service to receive events and keys. -->
+    <string name="capability_title_receiveAccessibilityEvents">Observe your actions</string>
+    <!-- Description for the capability of an accessibility service to receive events and keys. -->
+    <string name="capability_desc_receiveAccessibilityEvents">Receive notifications when you\'re
+        interacting with an app.</string>
+
+    <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <string name="disable_service_title">Stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>
+    <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+    <string name="disable_service_message">Touching OK will
         stop <xliff:g id="service" example="TalkBack">%1$s</xliff:g>.</string>
 
     <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
@@ -3169,11 +3223,6 @@
          help blind and low-vision users. Do you want to install it for free from Android
          Market?</string>
 
-    <!-- Warning message about security implications of downloading accessibility scripts,
-         displayed as a dialog message when the user selects to enable script downloading. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_script_injection_security_warning_summary">Do you want apps to
-        install scripts from Google that make their web content more accessible?</string>
-
     <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
     <string name="accessibility_service_default_description">No description provided.</string>
 
@@ -3206,7 +3255,7 @@
     <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
     <string name="battery_stats_gps_on_label">GPS on</string>
     <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
-    <string name="battery_stats_wifi_running_label">Wi-Fi</string>
+    <string name="battery_stats_wifi_running_label">Wi\u2011Fi</string>
     <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
     <string name="battery_stats_wake_lock_label">Awake</string>
     <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
@@ -3216,9 +3265,9 @@
     <!-- CPU awake time title -->
     <string name="awake">Device awake time</string>
     <!-- Wifi on time -->
-    <string name="wifi_on_time">Wi-Fi on time</string>
+    <string name="wifi_on_time">Wi\u2011Fi on time</string>
     <!-- Bluetooth on time -->
-    <string name="bluetooth_on_time">Wi-Fi on time</string>
+    <string name="bluetooth_on_time">Wi\u2011Fi on time</string>
     <!-- Application name and battery usage percentage -->
     <string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
             <xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
@@ -3238,7 +3287,7 @@
     <!-- Label for power consumed by the screen -->
     <string name="power_screen">Screen</string>
     <!-- Label for power consumed by Wi-Fi -->
-    <string name="power_wifi">Wi-Fi</string>
+    <string name="power_wifi">Wi\u2011Fi</string>
     <!-- Label for power consumed by Bluetooth -->
     <string name="power_bluetooth">Bluetooth</string>
     <!-- Label for power consumed by Cell idle -->
@@ -3259,7 +3308,7 @@
     <!-- Label for GPS usage time -->
     <string name="usage_type_gps">GPS</string>
     <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
-    <string name="usage_type_wifi_running">Wi-Fi running</string>
+    <string name="usage_type_wifi_running">Wi\u2011Fi running</string>
     <!-- Label for Phone usage time -->
     <string name="usage_type_phone" product="tablet">Tablet</string>
     <!-- Label for Phone usage time -->
@@ -3285,7 +3334,7 @@
     <!-- Label for display settings -->
     <string name="battery_action_display">Screen settings</string>
     <!-- Label for wifi settings -->
-    <string name="battery_action_wifi">Wi-Fi settings</string>
+    <string name="battery_action_wifi">Wi\u2011Fi settings</string>
     <!-- Label for bluetooth settings -->
     <string name="battery_action_bluetooth">Bluetooth settings</string>
 
@@ -3308,9 +3357,9 @@
     <string name="battery_sugg_display">Reduce the screen brightness and/or screen timeout</string>
 
     <!-- Description for wifi connectivity -->
-    <string name="battery_desc_wifi">Battery used by Wi-Fi</string>
+    <string name="battery_desc_wifi">Battery used by Wi\u2011Fi</string>
     <!-- Suggestion for wifi connectivity power drain -->
-    <string name="battery_sugg_wifi">Turn off Wi-Fi when not using it or when it isn\'t available</string>
+    <string name="battery_sugg_wifi">Turn off Wi\u2011Fi when not using it or when it isn\'t available</string>
 
     <!-- Description for bluetooth power consumption detail -->
     <string name="battery_desc_bluetooth">Battery used by Bluetooth</string>
@@ -3415,6 +3464,9 @@
     all the text that will be spoken, including personal data like passwords and credit
     card numbers. It comes from the <xliff:g id="tts_plugin_engine_name">%s</xliff:g> engine.
     Enable the use of this speech synthesis engine?</string>
+    <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+    <string name="tts_engine_network_required">This language requires a working network connection for text-to-speech output.</string>
     <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
     <string name="tts_engines_section">Engines</string>
     <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
@@ -3459,10 +3511,10 @@
 
     <!-- Power Control Widget -->
     <string name="gadget_title">Power control</string>
-    <string name="gadget_toggle_wifi">Updating Wi-Fi setting</string>
+    <string name="gadget_toggle_wifi">Updating Wi\u2011Fi setting</string>
     <string name="gadget_toggle_bluetooth">Updating Bluetooth setting</string>
     <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
-    <string name="gadget_state_template"><xliff:g name="feature" example="Wi-Fi">%1$s</xliff:g> <xliff:g name="state" example="off">%2$s</xliff:g></string>
+    <string name="gadget_state_template"><xliff:g name="feature" example="Wi\u2011Fi">%1$s</xliff:g> <xliff:g name="state" example="off">%2$s</xliff:g></string>
     <!-- Gadget value used to describe on state. -->
     <string name="gadget_state_on">on</string>
     <!-- Gadget value used to describe off state. -->
@@ -3472,7 +3524,7 @@
     <!-- Gadget value used to describe turning off state. -->
     <string name="gadget_state_turning_off">turning off</string>
     <!-- Spoken description for the Wi-Fi power control gadget. -->
-    <string name="gadget_wifi">Wi-Fi</string>
+    <string name="gadget_wifi">Wi\u2011Fi</string>
     <!-- Spoken description for the Bluetooth power control gadget. -->
     <string name="gadget_bluetooth">Bluetooth</string>
     <!-- Spoken description for the GPS power control gadget. -->
@@ -3511,6 +3563,12 @@
     <string name="trusted_credentials">Trusted credentials</string>
     <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
     <string name="trusted_credentials_summary">Display trusted CA certificates</string>
+    <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+    <string name="credential_storage_type">Storage type</string>
+    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+    <string name="credential_storage_type_hardware">Hardware-backed</string>
+    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+    <string name="credential_storage_type_software">Software only</string>
 
     <!-- Message to draw an unlock pattern when installing credentials -->
     <string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
@@ -3558,7 +3616,7 @@
     <!-- Backup data menu title -->
     <string name="backup_data_title">Back up my data</string>
     <!-- Summary text of the "back up data" setting -->
-    <string name="backup_data_summary">Back up app data, Wi-Fi passwords, and other settings to Google servers</string>
+    <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]-->
@@ -3585,7 +3643,7 @@
     <!-- Dialog title for confirmation to erase backup data from server -->
     <string name="backup_erase_dialog_title"></string>
     <!-- Dialog title for confirmation to erase backup data from server -->
-    <string name="backup_erase_dialog_message">Stop backing up your Wi-Fi passwords, bookmarks, other settings, and app data, plus erase all copies on Google servers?</string>
+    <string name="backup_erase_dialog_message">Stop backing up your Wi\u2011Fi passwords, bookmarks, other settings, and app data, plus erase all copies on Google servers?</string>
 
     <!-- Device admin settings screen --><skip />
     <!-- Device admin settings activity title -->
@@ -3630,22 +3688,22 @@
 
     <!-- Wifi Setup For Setup Wizard with XL screen -->
     <!-- Title shown in Wifi Setup Wizard with XL screen -->
-    <string name="wifi_setup_title">Wi-Fi setup</string>
+    <string name="wifi_setup_title">Wi\u2011Fi setup</string>
     <!-- Title shown in Wifi Setup Wizard with XL screen when
          a user is configuring password for a network.
          The argument should be the name of the network.
          [CHAR LIMIT=50] -->
-    <string name="wifi_setup_title_editing_network">Connect to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
+    <string name="wifi_setup_title_editing_network">Connect to Wi\u2011Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
     <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
          the device is connecting a network the user specified.
          The argument should be the name of the network.
          [CHAR LIMIT=50] -->
-    <string name="wifi_setup_title_connecting_network">Connecting to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g>\u2026</string>
+    <string name="wifi_setup_title_connecting_network">Connecting to Wi\u2011Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g>\u2026</string>
     <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
          the device successfully connected to a network the user specified.
          The argument should be the name of the network.
          [CHAR LIMIT=50] -->
-    <string name="wifi_setup_title_connected_network">Connected to Wi-Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
+    <string name="wifi_setup_title_connected_network">Connected to Wi\u2011Fi network <xliff:g id="network_name" example="Happy Mobile">%s</xliff:g></string>
     <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
          a user is adding a network.
          [CHAR LIMIT=50] -->
@@ -3721,11 +3779,11 @@
     <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
          saying EAP can't be configured in SetupWizard flow.
          [CHAR LIMIT=NONE] -->
-    <string name="wifi_setup_eap_not_supported">You can\'t configure an EAP Wi-Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks.</string>
+    <string name="wifi_setup_eap_not_supported">You can\'t configure an EAP Wi\u2011Fi connection during setup. After setup, you can do that in Settings &gt; Wireless &amp; networks.</string>
     <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
     <string name="wifi_setup_description_connecting">Connecting can take a few minutes\u2026</string>
     <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
-    <string name="wifi_setup_description_connected">Touch <b>Next</b> to continue with setup.\n\nTouch <b>Back</b> to connect to a different Wi-Fi network.</string>
+    <string name="wifi_setup_description_connected">Touch <b>Next</b> to continue with setup.\n\nTouch <b>Back</b> to connect to a different Wi\u2011Fi network.</string>
 
     <!-- Do not translate. This is a stub which will be removed soon. -->
     <string name="time_zone_auto_stub" translatable="false">Select Time Zone</string>
@@ -3877,6 +3935,9 @@
     <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
     <string name="debug_drawing_category">Drawing</string>
 
+    <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+    <string name="debug_hw_drawing_category">Hardware accelerated rendering</string>
+
     <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
     <string name="debug_monitoring_category">Monitoring</string>
 
@@ -3921,18 +3982,6 @@
     <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
     <string name="disable_overlays_summary">Always use GPU for screen compositing</string>
 
-    <!-- UI debug setting: enable low-level traces? [CHAR LIMIT=25] -->
-    <string name="enable_traces_title">Enable traces</string>
-    <!-- UI debug setting: title for dialog to enable low-level traces [CHAR LIMIT=25] -->
-    <string name="enable_traces_dialog_title">Select enabled traces</string>
-
-    <!-- UI debug setting: enable low-level traces, none enabled summary [CHAR LIMIT=NONE] -->
-    <string name="enable_traces_summary_none">No traces currently enabled</string>
-    <!-- UI debug setting: enable low-level traces, some number enabled summary [CHAR LIMIT=NONE] -->
-    <string name="enable_traces_summary_num"><xliff:g id="num">%1$d</xliff:g> traces currently enabled</string>
-    <!-- UI debug setting: enable low-level traces, all enabled summary [CHAR LIMIT=NONE] -->
-    <string name="enable_traces_summary_all">All traces currently enabled</string>
-
     <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
     <string name="enable_opengl_traces_title">Enable OpenGL traces</string>
 
@@ -3956,10 +4005,11 @@
     <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
     <string name="force_msaa_summary">Enable 4x MSAA in OpenGL ES 2.0 apps</string>
 
+    <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=50] -->
+    <string name="show_non_rect_clip">Debug non-rectangular clip operations</string>
+
     <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
     <string name="track_frame_time">Profile GPU rendering</string>
-    <!-- UI debug setting: profile hardware acceleration summary [CHAR LIMIT=50] -->
-    <string name="track_frame_time_summary">Measure rendering time in adb shell dumpsys gfxinfo</string>
 
     <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
     <string name="window_animation_scale_title">Window animation scale</string>
@@ -3991,6 +4041,11 @@
     <string name="show_all_anrs_summary">Show App Not Responding dialog
         for background apps</string>
 
+    <!-- UI debug setting: use experimental WebView [CHAR LIMIT=25] -->
+    <string name="experimental_webview">Use Experimental WebView</string>
+    <!-- UI debug setting: use experimental WebView summary [CHAR LIMIT=50] -->
+    <string name="experimental_webview_summary">Apps will use the newest (beta) WebView</string>
+
     <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
     <string name="data_usage_summary_title">Data usage</string>
     <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
@@ -4002,7 +4057,7 @@
     <!-- Title for checkbox menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_split_4g">Separate 4G usage</string>
     <!-- Title for checkbox menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
-    <string name="data_usage_menu_show_wifi">Show Wi-Fi usage</string>
+    <string name="data_usage_menu_show_wifi">Show Wi\u2011Fi usage</string>
     <!-- Title for checkbox menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
     <string name="data_usage_menu_show_ethernet">Show Ethernet usage</string>
     <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
@@ -4033,10 +4088,10 @@
     <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
     <string name="data_usage_disable_3g_limit">Set 2G-3G data limit</string>
     <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
-    <string name="data_usage_disable_wifi_limit">Set Wi-Fi data limit</string>
+    <string name="data_usage_disable_wifi_limit">Set Wi\u2011Fi data limit</string>
 
     <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
-    <string name="data_usage_tab_wifi">Wi-Fi</string>
+    <string name="data_usage_tab_wifi">Wi\u2011Fi</string>
     <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
     <string name="data_usage_tab_ethernet">Ethernet</string>
     <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=10] -->
@@ -4105,11 +4160,11 @@
     <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
     <string name="data_usage_restrict_background_title">Restrict background data?</string>
     <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_restrict_background">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.</string>
+    <string name="data_usage_restrict_background">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi\u2011Fi network.</string>
     <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_restrict_background_multiuser" product="tablet">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.\n\nThis setting affects all users on this tablet.</string>
+    <string name="data_usage_restrict_background_multiuser" product="tablet">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi\u2011Fi network.\n\nThis setting affects all users on this tablet.</string>
     <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_restrict_background_multiuser" product="default">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi-Fi network.\n\nThis setting affects all users on this phone.</string>
+    <string name="data_usage_restrict_background_multiuser" product="default">If you restrict background mobile data, some apps and services won\'t work unless you\'re connected to a Wi\u2011Fi network.\n\nThis setting affects all users on this phone.</string>
 
     <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
     <string name="data_usage_sweep_warning"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">warning</font></string>
@@ -4133,13 +4188,13 @@
     <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
     <string name="data_usage_metered_title">Mobile hotspots</string>
     <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_metered_body">Select the Wi-Fi networks which are mobile hotspots.  Apps can be restricted from using these networks when in the background.  Apps may also warn before using these networks for large downloads.</string>
+    <string name="data_usage_metered_body">Select the Wi\u2011Fi networks which are mobile hotspots.  Apps can be restricted from using these networks when in the background.  Apps may also warn before using these networks for large downloads.</string>
     <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
     <string name="data_usage_metered_mobile">Mobile networks</string>
     <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
-    <string name="data_usage_metered_wifi">Wi-Fi networks</string>
+    <string name="data_usage_metered_wifi">Wi\u2011Fi networks</string>
     <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
-    <string name="data_usage_metered_wifi_disabled">To select mobile hotspots, turn Wi-Fi on.</string>
+    <string name="data_usage_metered_wifi_disabled">To select mobile hotspots, turn Wi\u2011Fi on.</string>
 
     <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
     <string name="cryptkeeper_emergency_call">Emergency call</string>
@@ -4271,32 +4326,48 @@
 
     <!-- User settings screen title [CHAR LIMIT=25] -->
     <string name="user_settings_title">Users</string>
-    <!-- User settings section title for details about you [CHAR LIMIT=25] -->
-    <string name="user_you_section">You</string>
-    <!-- User settings user list section header [CHAR LIMIT=30] -->
-    <string name="user_list_title">Other users</string>
-    <!-- User settings add user menu [CHAR LIMIT=20] -->
-    <string name="user_add_user_menu">Add user</string>
-    <!-- User summary to indicate that user is currently active in the background [CHAR LIMIT=100] -->
-    <string name="user_summary_active">Active</string>
-    <!-- User summary to indicate that user is currently inactive in the background [CHAR LIMIT=100] -->
-    <string name="user_summary_inactive">Not active</string>
+    <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+    <string name="user_list_title">Users &amp; profiles</string>
+    <!-- User settings add user menu [CHAR LIMIT=35] -->
+    <string name="user_add_user_menu">Add user or profile</string>
+    <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+    <string name="user_summary_restricted_profile">Restricted profile</string>
+    <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+    <string name="user_need_lock_message">Before you can create a restricted profile, you\'ll need to set up a screen lock to protect your apps and personal data.</string>
+    <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+    <string name="user_set_lock_button">Set lock</string>
     <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
     <string name="user_summary_not_set_up">Not set up</string>
+    <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+    <string name="user_summary_restricted_not_set_up">Not set up - Restricted profile</string>
     <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
     <string name="user_owner">Owner</string>
+    <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+    <string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
     <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
     <string name="user_nickname">Nickname</string>
+    <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+    <string name="user_add_user_type_title">Add</string>
+    <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+    <string name="user_add_user_item_summary">Users have their own apps and content</string>
+    <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+    <string name="user_add_profile_item_summary">You can restrict access to apps and content from your account</string>
+    <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+    <string name="user_add_user_item_title">User</string>
+    <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+    <string name="user_add_profile_item_title">Restricted profile</string>
     <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
     <string name="user_add_user_title">Add new user</string>
     <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
-    <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust tablet settings like Wi-Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users.</string>
+    <string name="user_add_user_message_long">You can share this device with other people by creating additional users. Each user has their own space, which they can customize with their own apps, wallpaper, and so on. Users can also adjust tablet settings like Wi\u2011Fi that affect everyone.\n\nAfter you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users.</string>
     <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
     <string name="user_add_user_message_short">After you create a new user, that person needs to go through a setup process.\n\nAny user can accept updated app permissions on behalf of all other users.</string>
     <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
     <string name="user_setup_dialog_title">Set up user now?</string>
     <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
     <string name="user_setup_dialog_message">Make sure the person is available to take the tablet and set up their space</string>
+    <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+    <string name="user_setup_profile_dialog_message">Set up profile now?</string>
     <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
     <string name="user_setup_button_setup_now">Set up now</string>
     <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
@@ -4305,15 +4376,21 @@
     <string name="user_cannot_manage_message" product="tablet">Only the tablet\'s owner can manage users.</string>
     <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
     <string name="user_cannot_manage_message" product="default">Only the phone\'s owner can manage users.</string>
+    <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+    <string name="user_cannot_add_accounts_message">Restricted profiles cannot add accounts</string>
 
     <!-- User details remove user menu [CHAR LIMIT=20] -->
     <string name="user_remove_user_menu">Delete <xliff:g id="user_name">%1$s</xliff:g> from this device</string>
     <!-- User details new user name [CHAR LIMIT=30] -->
     <string name="user_new_user_name">New user</string>
+    <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+    <string name="user_new_profile_name">New profile</string>
     <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
     <string name="user_confirm_remove_self_title">Delete yourself?</string>
     <!-- User removal confirmation title [CHAR LIMIT=25] -->
     <string name="user_confirm_remove_title">Remove user?</string>
+    <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+    <string name="user_profile_confirm_remove_title">Remove profile?</string>
     <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
     <string name="user_confirm_remove_self_message" product="tablet">You will lose your space and data on this tablet. You can\'t undo this action.</string>
     <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
@@ -4322,6 +4399,10 @@
     <string name="user_confirm_remove_message" product="tablet">This user\'s space and data will disappear from this tablet. You can\'t undo this action.</string>
     <!-- User removal confirmation message [CHAR LIMIT=none] -->
     <string name="user_confirm_remove_message" product="default">This user\'s space and data will disappear from this phone. You can\'t undo this action.</string>
+    <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_profile_confirm_remove_message" product="tablet">This profile\'s space and data will disappear from this tablet. You can\'t undo this action.</string>
+    <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+    <string name="user_profile_confirm_remove_message" product="default">This profile\'s space and data will disappear from this phone. You can\'t undo this action.</string>
     <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
     <string name="user_adding_new_user">Adding new user\u2026</string>
     <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
@@ -4329,6 +4410,13 @@
     <!-- Delete button text [CHAR LIMIT=25] -->
     <string name="user_delete_button">Delete</string>
 
+    <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+    <string name="application_restrictions">Allow apps and content</string>
+    <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+    <string name="apps_with_restrictions_header">Applications with restrictions</string>
+    <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+    <string name="apps_with_restrictions_settings_button">Expand settings for application</string>
+
     <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
     <string name="global_change_warning" product="tablet">This setting affects all users on this tablet.</string>
     <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
@@ -4384,4 +4472,51 @@
     <string name="cell_broadcast_settings">Cell broadcasts</string>
     <!-- Cell Broadcast settings description [CHAR LIMIT=100] -->
     <string name="cell_broadcast_settings_summary">Select the types of emergency alerts to display.</string>
+
+    <!-- User app limits screen title [CHAR LIMIT=35] -->
+    <string name="user_restrictions_title">Application and content restrictions</string>
+    <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+    <string name="user_rename">RENAME</string>
+    <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+    <string name="app_restrictions_custom_label">Set application limits</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>
+
+    <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+    <string name="restriction_wifi_config_title">Wi\u2011Fi and Mobile</string>
+    <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+    <string name="restriction_wifi_config_summary">Allow modification of Wi\u2011Fi and Mobile settings</string>
+    <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+    <string name="restriction_bluetooth_config_title">Bluetooth</string>
+    <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+    <string name="restriction_bluetooth_config_summary">Allow modification of Bluetooth pairings and settings</string>
+    <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+    <string name="restriction_nfc_enable_title">NFC</string>
+    <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+    <string name="restriction_nfc_enable_summary" product="tablet">Allow data exchange when the tablet touches another device</string>
+    <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+    <string name="restriction_nfc_enable_summary" product="default">Allow data exchange when the phone touches another device</string>
+    <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+    <string name="restriction_location_enable_title">Location access</string>
+    <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+    <string name="restriction_location_enable_summary" >Let apps use your location information</string>
+
+    <!-- Wizard back button label [CHAR LIMIT=25] -->
+    <string name="wizard_back">Back</string>
+    <!-- Wizard next button label [CHAR LIMIT=25] -->
+    <string name="wizard_next">Next</string>
+    <!-- Wizard next button label [CHAR LIMIT=25] -->
+    <string name="wizard_finish">Finish</string>
+
+    <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+    <string name="user_image_take_photo" msgid="7496128293167402354">Take photo</string>
+    <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+    <string name="user_image_choose_photo" msgid="3746334626214970837">Choose photo from Gallery</string>
+
+    <!-- Text to display in regulatory info screen (from device overlay). -->
+    <string name="regulatory_info_text"></string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dda22d9..ebd8722 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -121,12 +121,20 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">14sp</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
     <style name="wifi_item_content">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textSize">18sp</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
+    <style name="wifi_item_edit_content">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">18sp</item>
     </style>
 
     <style name="wifi_section">
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 15b5b2e..fa447f2 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -67,17 +67,6 @@
                 android:entryValues="@array/long_press_timeout_selector_values"
                 android:persistent="false"/>
 
-        <!-- We want a dialog with no title, so use an empty string to avoid a fall back to the preference title. -->
-        <com.android.settings.AccessibilityEnableScriptInjectionPreference
-                android:key="toggle_script_injection_preference"
-                android:title="@string/accessibility_toggle_script_injection_preference_title"
-                android:dialogTitle=""
-                android:dialogIcon="@android:drawable/ic_dialog_alert"
-                android:dialogMessage="@string/accessibility_script_injection_security_warning_summary"
-                android:positiveButtonText="@string/accessibility_script_injection_button_allow"
-                android:negativeButtonText="@string/accessibility_script_injection_button_disallow"
-                android:persistent="false"/>
-
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/app_restrictions.xml b/res/xml/app_restrictions.xml
new file mode 100644
index 0000000..ddc911d
--- /dev/null
+++ b/res/xml/app_restrictions.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/application_restrictions"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+    <Preference
+        android:key="user_info"
+        android:order="0"/>
+
+</PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index e67aad1..72b73bb 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -57,6 +57,9 @@
             android:title="@string/enable_adb"
             android:summary="@string/enable_adb_summary"/>
 
+        <Preference android:key="clear_adb_keys"
+                android:title="@string/clear_adb_keys" />
+
         <CheckBoxPreference
             android:key="bugreport_in_power"
             android:title="@string/bugreport_in_power"
@@ -101,30 +104,15 @@
             android:title="@string/debug_drawing_category">
 
         <CheckBoxPreference
-            android:key="debug_layout"
-            android:title="@string/debug_layout"
-            android:summary="@string/debug_layout_summary"/>
-
-        <CheckBoxPreference
-            android:key="show_hw_screen_udpates"
-            android:title="@string/show_hw_screen_updates"
-            android:summary="@string/show_hw_screen_updates_summary"/>
-
-        <CheckBoxPreference
-            android:key="show_hw_layers_udpates"
-            android:title="@string/show_hw_layers_updates"
-            android:summary="@string/show_hw_layers_updates_summary"/>
-
-        <CheckBoxPreference
-            android:key="show_hw_overdraw"
-            android:title="@string/show_hw_overdraw"
-            android:summary="@string/show_hw_overdraw_summary"/>
-
-        <CheckBoxPreference
             android:key="show_screen_updates"
             android:title="@string/show_screen_updates"
             android:summary="@string/show_screen_updates_summary"/>
 
+        <CheckBoxPreference
+            android:key="debug_layout"
+            android:title="@string/debug_layout"
+            android:summary="@string/debug_layout_summary"/>
+
         <ListPreference
             android:key="window_animation_scale"
             android:title="@string/window_animation_scale_title"
@@ -146,21 +134,6 @@
             android:entries="@array/animator_duration_scale_entries"
             android:entryValues="@array/animator_duration_scale_values" />
 
-        <CheckBoxPreference
-            android:key="disable_overlays"
-            android:title="@string/disable_overlays"
-            android:summary="@string/disable_overlays_summary"/>
-
-        <CheckBoxPreference
-            android:key="force_hw_ui"
-            android:title="@string/force_hw_ui"
-            android:summary="@string/force_hw_ui_summary"/>
-
-        <CheckBoxPreference
-            android:key="force_msaa"
-            android:title="@string/force_msaa"
-            android:summary="@string/force_msaa_summary"/>
-
         <ListPreference
             android:key="overlay_display_devices"
             android:title="@string/overlay_display_devices_title"
@@ -170,6 +143,48 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory android:key="debug_hw_drawing_category"
+            android:title="@string/debug_hw_drawing_category">
+
+        <CheckBoxPreference
+                android:key="force_hw_ui"
+                android:title="@string/force_hw_ui"
+                android:summary="@string/force_hw_ui_summary"/>
+
+        <CheckBoxPreference
+                android:key="show_hw_screen_udpates"
+                android:title="@string/show_hw_screen_updates"
+                android:summary="@string/show_hw_screen_updates_summary"/>
+
+        <CheckBoxPreference
+                android:key="show_hw_layers_udpates"
+                android:title="@string/show_hw_layers_updates"
+                android:summary="@string/show_hw_layers_updates_summary"/>
+
+        <CheckBoxPreference
+                android:key="show_hw_overdraw"
+                android:title="@string/show_hw_overdraw"
+                android:summary="@string/show_hw_overdraw_summary"/>
+
+        <ListPreference
+                android:key="show_non_rect_clip"
+                android:title="@string/show_non_rect_clip"
+                android:persistent="false"
+                android:entries="@array/show_non_rect_clip_entries"
+                android:entryValues="@array/show_non_rect_clip_values" />
+
+        <CheckBoxPreference
+                android:key="force_msaa"
+                android:title="@string/force_msaa"
+                android:summary="@string/force_msaa_summary"/>
+
+        <CheckBoxPreference
+                android:key="disable_overlays"
+                android:title="@string/disable_overlays"
+                android:summary="@string/disable_overlays_summary"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory android:key="debug_monitoring_category"
             android:title="@string/debug_monitoring_category">
 
@@ -183,10 +198,12 @@
             android:title="@string/show_cpu_usage"
             android:summary="@string/show_cpu_usage_summary"/>
 
-        <CheckBoxPreference
+        <ListPreference
             android:key="track_frame_time"
             android:title="@string/track_frame_time"
-            android:summary="@string/track_frame_time_summary"/>
+            android:persistent="false"
+            android:entries="@array/track_frame_time_entries"
+            android:entryValues="@array/track_frame_time_values" />
 
         <ListPreference
             android:key="enable_opengl_traces"
@@ -195,11 +212,6 @@
             android:entries="@array/enable_opengl_traces_entries"
             android:entryValues="@array/enable_opengl_traces_values" />
 
-        <MultiCheckPreference
-            android:key="enable_traces"
-            android:title="@string/enable_traces_title"
-            android:dialogTitle="@string/enable_traces_dialog_title" />
-
     </PreferenceCategory>
 
     <PreferenceCategory android:key="debug_applications_category"
@@ -222,6 +234,11 @@
             android:title="@string/show_all_anrs"
             android:summary="@string/show_all_anrs_summary"/>
 
+        <CheckBoxPreference
+            android:key="experimental_webview"
+            android:title="@string/experimental_webview"
+            android:summary="@string/experimental_webview_summary"/>
+
      </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 03f1e78..07abe41 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -89,8 +89,11 @@
         </PreferenceScreen>
         -->
 
-        <com.android.settings.RegulatoryInfoPreference android:key="regulatory_info"
-                android:title="@string/regulatory_information" />
+        <PreferenceScreen
+                android:key="regulatory_info"
+                android:title="@string/regulatory_information">
+            <intent android:action="android.settings.SHOW_REGULATORY_INFO" />
+        </PreferenceScreen>
 
         <!-- Device hardware model -->
         <Preference android:key="device_model" 
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index d14446c..0eb90d0 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -19,9 +19,8 @@
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
         <com.android.settings.BrightnessPreference
-                android:key="brightness"
                 android:title="@string/brightness"
-                android:dialogTitle="@string/brightness" />
+                android:persistent="false"/>
 
         <PreferenceScreen
                 android:key="wallpaper"
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index ee87e51..1ead7a9 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -58,11 +58,23 @@
                 android:summaryOff="@string/verify_applications_summary"
                 android:summaryOn="@string/verify_applications_summary"
                 android:persistent="false" />
+
+        <Preference
+                android:key="manage_notification_access"
+                android:title="@string/manage_notification_access"
+                android:persistent="false"
+                android:fragment="com.android.settings.NotificationAccessSettings"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory android:key="credentials_management"
             android:title="@string/credentials_title"
             android:persistent="false">
+        <Preference android:key="credential_storage_type"
+                android:title="@string/credential_storage_type"
+                style="?android:attr/preferenceInformationStyle"
+                android:persistent="false" />
+
         <Preference android:title="@string/trusted_credentials"
                 android:summary="@string/trusted_credentials_summary"
                 android:persistent="false"
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index d97f1a6..cf393b3 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -19,24 +19,13 @@
         android:title="@string/user_settings_title">
 
     <PreferenceCategory
-            android:key="user_you"
-            android:title="@string/user_you_section"/>
-    <Preference
-            android:key="user_me"
-            android:summary="@string/user_owner" />
-    <com.android.settings.SelectableEditTextPreference
-            android:key="user_nickname"
-            android:title="@string/user_nickname"
-            android:icon="@drawable/empty_icon" />
-    <Preference
-            android:key="user_owner_info"
-            android:title="@string/owner_info_settings_title"
-            android:icon="@drawable/empty_icon"
-            android:fragment="com.android.settings.OwnerInfoSettings" />
-
-    <PreferenceCategory
             android:key="user_list"
             android:title="@string/user_list_title">
     </PreferenceCategory>
 
+    <Preference
+            android:key="user_add"
+            android:title="@string/user_add_user_menu"
+            android:icon="@drawable/ic_menu_add" />
+
 </PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 10eab29..d250585 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -31,6 +31,11 @@
             android:entries="@array/wifi_sleep_policy_entries"
             android:entryValues="@array/wifi_sleep_policy_values"
             />
+    <CheckBoxPreference
+            android:key="wifi_scan_always_available"
+            android:title="@string/wifi_scan_always_available"
+            android:summary="@string/wifi_scan_always_available_summary"
+            android:persistent="false" />
 
     <!-- android:dependency="enable_wifi" -->
     <CheckBoxPreference
@@ -48,6 +53,11 @@
             android:entryValues="@array/wifi_frequency_band_values"
             />
 
+    <Preference
+            android:key="install_credentials"
+            android:title="@string/wifi_install_credentials"
+            android:persistent="false" />
+
     <CheckBoxPreference
             android:key="suspend_optimizations"
             android:title="@string/wifi_suspend_optimizations"
diff --git a/src/com/android/settings/AccessibilityEnableScriptInjectionPreference.java b/src/com/android/settings/AccessibilityEnableScriptInjectionPreference.java
deleted file mode 100644
index a9338ed..0000000
--- a/src/com/android/settings/AccessibilityEnableScriptInjectionPreference.java
+++ /dev/null
@@ -1,175 +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;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.DialogPreference;
-import android.provider.Settings;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
-import android.view.accessibility.AccessibilityManager;
-
-/**
- * Preference for enabling accessibility script injection. It displays a warning
- * dialog before enabling the preference.
- */
-public class AccessibilityEnableScriptInjectionPreference extends DialogPreference {
-
-    private boolean mInjectionAllowed;
-    private boolean mSendClickAccessibilityEvent;
-
-    public AccessibilityEnableScriptInjectionPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        updateSummary();
-    }
-
-    public void setInjectionAllowed(boolean injectionAllowed) {
-        if (mInjectionAllowed != injectionAllowed) {
-            mInjectionAllowed = injectionAllowed;
-            persistBoolean(injectionAllowed);
-            updateSummary();
-        }
-    }
-
-    public boolean isInjectionAllowed() {
-        return mInjectionAllowed;
-    }
-
-    @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-        View summaryView = view.findViewById(com.android.internal.R.id.summary);
-        sendAccessibilityEvent(summaryView);
-    }
-
-    private void sendAccessibilityEvent(View view) {
-        // Since the view is still not attached we create, populate,
-        // and send the event directly since we do not know when it
-        // will be attached and posting commands is not as clean.
-        AccessibilityManager accessibilityManager = AccessibilityManager.getInstance(getContext());
-        if (mSendClickAccessibilityEvent && accessibilityManager.isEnabled()) {
-            AccessibilityEvent event = AccessibilityEvent.obtain();
-            event.setEventType(AccessibilityEvent.TYPE_VIEW_CLICKED);
-            view.onInitializeAccessibilityEvent(event);
-            view.dispatchPopulateAccessibilityEvent(event);
-            accessibilityManager.sendAccessibilityEvent(event);
-        }
-        mSendClickAccessibilityEvent = false;
-    }
-
-    @Override
-    protected void onClick() {
-        if (isInjectionAllowed()) {
-            setInjectionAllowed(false);
-            // Update the system setting only upon user action.
-            setSystemSetting(false);
-            mSendClickAccessibilityEvent = true;
-        } else {
-            super.onClick();
-            mSendClickAccessibilityEvent = false;
-        }
-    }
-
-    @Override
-    protected Object onGetDefaultValue(TypedArray a, int index) {
-        return a.getBoolean(index, false);
-    }
-
-    @Override
-    protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
-        setInjectionAllowed(restoreValue
-                ? getPersistedBoolean(mInjectionAllowed)
-                : (Boolean) defaultValue);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean result) {
-        setInjectionAllowed(result);
-        if (result) {
-            // Update the system setting only upon user action.
-            setSystemSetting(true);
-        }
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Parcelable superState = super.onSaveInstanceState();
-        if (isPersistent()) {
-            return superState;
-        }
-        SavedState myState = new SavedState(superState);
-        myState.mInjectionAllowed = mInjectionAllowed;
-        return myState;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state == null || !state.getClass().equals(SavedState.class)) {
-            super.onRestoreInstanceState(state);
-            return;
-        }
-        SavedState myState = (SavedState) state;
-        super.onRestoreInstanceState(myState.getSuperState());
-        setInjectionAllowed(myState.mInjectionAllowed);
-    }
-
-    private void updateSummary() {
-        setSummary(mInjectionAllowed
-                ? getContext().getString(R.string.accessibility_script_injection_allowed)
-                : getContext().getString(R.string.accessibility_script_injection_disallowed));
-    }
-
-    private void setSystemSetting(boolean enabled) {
-        Settings.Secure.putInt(getContext().getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, enabled ? 1 : 0);
-    }
-
-    private static class SavedState extends BaseSavedState {
-        private boolean mInjectionAllowed;
-
-        public SavedState(Parcel source) {
-            super(source);
-            mInjectionAllowed = (source.readInt() == 1);
-        }
-
-        @Override
-        public void writeToParcel(Parcel parcel, int flags) {
-            super.writeToParcel(parcel, flags);
-            parcel.writeInt(mInjectionAllowed ? 1 : 0);
-        }
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        @SuppressWarnings("all")
-        public static final Parcelable.Creator<SavedState> CREATOR =
-                new Parcelable.Creator<SavedState>() {
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
-}
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index b6556a9..ea4940e 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -32,6 +32,8 @@
 import android.content.pm.ServiceInfo;
 import android.content.res.Configuration;
 import android.database.ContentObserver;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -50,12 +52,14 @@
 import android.view.Gravity;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
@@ -108,8 +112,6 @@
             "toggle_speak_password_preference";
     private static final String SELECT_LONG_PRESS_TIMEOUT_PREFERENCE =
             "select_long_press_timeout_preference";
-    private static final String TOGGLE_SCRIPT_INJECTION_PREFERENCE =
-            "toggle_script_injection_preference";
     private static final String ENABLE_ACCESSIBILITY_GESTURE_PREFERENCE_SCREEN =
             "enable_global_gesture_preference_screen";
     private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
@@ -120,13 +122,9 @@
     private static final String EXTRA_CHECKED = "checked";
     private static final String EXTRA_TITLE = "title";
     private static final String EXTRA_SUMMARY = "summary";
-    private static final String EXTRA_ENABLE_WARNING_TITLE = "enable_warning_title";
-    private static final String EXTRA_ENABLE_WARNING_MESSAGE = "enable_warning_message";
-    private static final String EXTRA_DISABLE_WARNING_TITLE = "disable_warning_title";
-    private static final String EXTRA_DISABLE_WARNING_MESSAGE = "disable_warning_message";
     private static final String EXTRA_SETTINGS_TITLE = "settings_title";
+    private static final String EXTRA_COMPONENT_NAME = "component_name";
     private static final String EXTRA_SETTINGS_COMPONENT_NAME = "settings_component_name";
-    private static final String EXTRA_SERVICE_COMPONENT_NAME = "service_component_name";
 
     // Dialog IDs.
     private static final int DIALOG_ID_NO_ACCESSIBILITY_SERVICES = 1;
@@ -179,7 +177,6 @@
     private CheckBoxPreference mToggleLockScreenRotationPreference;
     private CheckBoxPreference mToggleSpeakPasswordPreference;
     private ListPreference mSelectLongPressTimeoutPreference;
-    private AccessibilityEnableScriptInjectionPreference mToggleScriptInjectionPreference;
     private Preference mNoServicesMessagePreference;
     private PreferenceScreen mDisplayMagnificationPreferenceScreen;
     private PreferenceScreen mGlobalGesturePreferenceScreen;
@@ -344,10 +341,6 @@
             }
         }
 
-        // Script injection.
-        mToggleScriptInjectionPreference = (AccessibilityEnableScriptInjectionPreference)
-                findPreference(TOGGLE_SCRIPT_INJECTION_PREFERENCE);
-
         // Display magnification.
         mDisplayMagnificationPreferenceScreen = (PreferenceScreen) findPreference(
                 DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
@@ -416,20 +409,6 @@
             }
             extras.putString(EXTRA_SUMMARY, description);
 
-            CharSequence applicationLabel = info.getResolveInfo().loadLabel(getPackageManager());
-
-            extras.putString(EXTRA_ENABLE_WARNING_TITLE, getString(
-                    R.string.accessibility_service_security_warning_title, applicationLabel));
-            extras.putString(EXTRA_ENABLE_WARNING_MESSAGE, getString(
-                    R.string.accessibility_service_security_warning_summary, applicationLabel));
-
-            extras.putString(EXTRA_DISABLE_WARNING_TITLE, getString(
-                    R.string.accessibility_service_disable_warning_title,
-                    applicationLabel));
-            extras.putString(EXTRA_DISABLE_WARNING_MESSAGE, getString(
-                    R.string.accessibility_service_disable_warning_summary,
-                    applicationLabel));
-
             String settingsClassName = info.getSettingsActivityName();
             if (!TextUtils.isEmpty(settingsClassName)) {
                 extras.putString(EXTRA_SETTINGS_TITLE,
@@ -439,7 +418,7 @@
                                 settingsClassName).flattenToString());
             }
 
-            extras.putString(EXTRA_SERVICE_COMPONENT_NAME, componentName.flattenToString());
+            extras.putParcelable(EXTRA_COMPONENT_NAME, componentName);
 
             mServicesCategory.addPreference(preference);
         }
@@ -450,11 +429,6 @@
                     @Override
                     protected void onBindView(View view) {
                         super.onBindView(view);
-
-                        LinearLayout containerView =
-                                (LinearLayout) view.findViewById(R.id.message_container);
-                        containerView.setGravity(Gravity.CENTER);
-
                         TextView summaryView = (TextView) view.findViewById(R.id.summary);
                         String title = getString(R.string.accessibility_no_services_installed);
                         summaryView.setText(title);
@@ -504,11 +478,6 @@
         mSelectLongPressTimeoutPreference.setValue(value);
         mSelectLongPressTimeoutPreference.setSummary(mLongPressTimeoutValuetoTitleMap.get(value));
 
-        // Script injection.
-        final boolean scriptInjectionAllowed = (Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION, 0) == 1);
-        mToggleScriptInjectionPreference.setInjectionAllowed(scriptInjectionAllowed);
-
         // Screen magnification.
         final boolean magnificationEnabled = Settings.Secure.getInt(getContentResolver(),
                 Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, 0) == 1;
@@ -601,11 +570,16 @@
     }
 
     private void loadInstalledServices() {
+        Set<ComponentName> installedServices = sInstalledServices;
+        installedServices.clear();
+
         List<AccessibilityServiceInfo> installedServiceInfos =
                 AccessibilityManager.getInstance(getActivity())
                         .getInstalledAccessibilityServiceList();
-        Set<ComponentName> installedServices = sInstalledServices;
-        installedServices.clear();
+        if (installedServiceInfos == null) {
+            return;
+        }
+
         final int installedServiceInfoCount = installedServiceInfos.size();
         for (int i = 0; i < installedServiceInfoCount; i++) {
             ResolveInfo resolveInfo = installedServiceInfos.get(i).getResolveInfo();
@@ -705,17 +679,12 @@
             public void onChange(boolean selfChange, Uri uri) {
                 String settingValue = Settings.Secure.getString(getContentResolver(),
                         Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-                final boolean enabled = settingValue.contains(mComponentName);
+                final boolean enabled = settingValue.contains(mComponentName.flattenToString());
                 mToggleSwitch.setCheckedInternal(enabled);
             }
         };
 
-        private CharSequence mEnableWarningTitle;
-        private CharSequence mEnableWarningMessage;
-        private CharSequence mDisableWarningTitle;
-        private CharSequence mDisableWarningMessage;
-
-        private String mComponentName;
+        private ComponentName mComponentName;
 
         private int mShownDialogId;
 
@@ -738,25 +707,22 @@
 
             // Determine enabled services and accessibility state.
             ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
-            final boolean accessibilityEnabled;
+            boolean accessibilityEnabled = false;
             if (enabled) {
+                enabledServices.add(toggledService);
                 // Enabling at least one service enables accessibility.
                 accessibilityEnabled = true;
-                enabledServices.add(toggledService);
             } else {
+                enabledServices.remove(toggledService);
                 // Check how many enabled and installed services are present.
-                int enabledAndInstalledServiceCount = 0;
                 Set<ComponentName> installedServices = sInstalledServices;
                 for (ComponentName enabledService : enabledServices) {
                     if (installedServices.contains(enabledService)) {
-                        enabledAndInstalledServiceCount++;
+                        // Disabling the last service disables accessibility.
+                        accessibilityEnabled = true;
+                        break;
                     }
                 }
-                // Disabling the last service disables accessibility.
-                accessibilityEnabled = enabledAndInstalledServiceCount > 1
-                        || (enabledAndInstalledServiceCount == 1
-                        && !installedServices.contains(toggledService));
-                enabledServices.remove(toggledService);
             }
 
             // Update the enabled services setting.
@@ -782,32 +748,126 @@
                     Settings.Secure.ACCESSIBILITY_ENABLED, accessibilityEnabled ? 1 : 0);
         }
 
+        // IMPORTANT: Refresh the info since there are dynamically changing capabilities. For
+        // example, before JellyBean MR2 the user was granting the explore by touch one.
+        private AccessibilityServiceInfo getAccessibilityServiceInfo() {
+            List<AccessibilityServiceInfo> serviceInfos = AccessibilityManager.getInstance(
+                    getActivity()).getInstalledAccessibilityServiceList();
+            final int serviceInfoCount = serviceInfos.size();
+            for (int i = 0; i < serviceInfoCount; i++) {
+                AccessibilityServiceInfo serviceInfo = serviceInfos.get(i);
+                ResolveInfo resolveInfo = serviceInfo.getResolveInfo();
+                if (mComponentName.getPackageName().equals(resolveInfo.serviceInfo.packageName)
+                        && mComponentName.getClassName().equals(resolveInfo.serviceInfo.name)) {
+                    return serviceInfo;
+                }
+            }
+            return null;
+        }
+
         @Override
         public Dialog onCreateDialog(int dialogId) {
-            CharSequence title = null;
-            CharSequence message = null;
             switch (dialogId) {
-                case DIALOG_ID_ENABLE_WARNING:
+                case DIALOG_ID_ENABLE_WARNING: {
                     mShownDialogId = DIALOG_ID_ENABLE_WARNING;
-                    title = mEnableWarningTitle;
-                    message = mEnableWarningMessage;
-                    break;
-                case DIALOG_ID_DISABLE_WARNING:
+                    AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+                    if (info == null) {
+                        return null;
+                    }
+                    return new AlertDialog.Builder(getActivity())
+                        .setTitle(getString(R.string.enable_service_title,
+                                info.getResolveInfo().loadLabel(getPackageManager())))
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
+                        .setView(createEnableDialogContentView(info))
+                        .setCancelable(true)
+                        .setPositiveButton(android.R.string.ok, this)
+                        .setNegativeButton(android.R.string.cancel, this)
+                        .create();
+                }
+                case DIALOG_ID_DISABLE_WARNING: {
                     mShownDialogId = DIALOG_ID_DISABLE_WARNING;
-                    title = mDisableWarningTitle;
-                    message = mDisableWarningMessage;
-                    break;
-                default:
+                    AccessibilityServiceInfo info = getAccessibilityServiceInfo();
+                    if (info == null) {
+                        return null;
+                    }
+                    return new AlertDialog.Builder(getActivity())
+                        .setTitle(getString(R.string.disable_service_title,
+                                info.getResolveInfo().loadLabel(getPackageManager())))
+                        .setIconAttribute(android.R.attr.alertDialogIcon)
+                        .setMessage(getString(R.string.disable_service_message,
+                                info.getResolveInfo().loadLabel(getPackageManager())))
+                        .setCancelable(true)
+                        .setPositiveButton(android.R.string.ok, this)
+                        .setNegativeButton(android.R.string.cancel, this)
+                        .create();
+                }
+                default: {
                     throw new IllegalArgumentException();
+                }
             }
-            return new AlertDialog.Builder(getActivity())
-                    .setTitle(title)
-                    .setIconAttribute(android.R.attr.alertDialogIcon)
-                    .setMessage(message)
-                    .setCancelable(true)
-                    .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, this)
-                    .create();
+        }
+
+        private View createEnableDialogContentView(AccessibilityServiceInfo info) {
+            LayoutInflater inflater = (LayoutInflater) getSystemService(
+                    Context.LAYOUT_INFLATER_SERVICE);
+
+            View content = inflater.inflate(R.layout.enable_accessibility_service_dialog_content,
+                    null);
+
+            TextView capabilitiesHeaderView = (TextView) content.findViewById(
+                    R.id.capabilities_header);
+            capabilitiesHeaderView.setText(getString(R.string.capabilities_list_title,
+                    info.getResolveInfo().loadLabel(getPackageManager())));
+
+            LinearLayout capabilitiesView = (LinearLayout) content.findViewById(R.id.capabilities);
+
+            // This capability is implicit for all services.
+            View capabilityView = inflater.inflate(
+                    com.android.internal.R.layout.app_permission_item_old, null);
+
+            ImageView imageView = (ImageView) capabilityView.findViewById(
+                    com.android.internal.R.id.perm_icon);
+            imageView.setImageDrawable(getResources().getDrawable(
+                    com.android.internal.R.drawable.ic_text_dot));
+
+            TextView labelView = (TextView) capabilityView.findViewById(
+                    com.android.internal.R.id.permission_group);
+            labelView.setText(getString(R.string.capability_title_receiveAccessibilityEvents));
+
+            TextView descriptionView = (TextView) capabilityView.findViewById(
+                    com.android.internal.R.id.permission_list);
+            descriptionView.setText(getString(R.string.capability_desc_receiveAccessibilityEvents));
+
+            List<AccessibilityServiceInfo.CapabilityInfo> capabilities =
+                    info.getCapabilityInfos();
+
+            capabilitiesView.addView(capabilityView);
+
+            // Service specific capabilities.
+            final int capabilityCount = capabilities.size();
+            for (int i = 0; i < capabilityCount; i++) {
+                AccessibilityServiceInfo.CapabilityInfo capability = capabilities.get(i);
+
+                capabilityView = inflater.inflate(
+                        com.android.internal.R.layout.app_permission_item_old, null);
+
+                imageView = (ImageView) capabilityView.findViewById(
+                        com.android.internal.R.id.perm_icon);
+                imageView.setImageDrawable(getResources().getDrawable(
+                        com.android.internal.R.drawable.ic_text_dot));
+
+                labelView = (TextView) capabilityView.findViewById(
+                        com.android.internal.R.id.permission_group);
+                labelView.setText(getString(capability.titleResId));
+
+                descriptionView = (TextView) capabilityView.findViewById(
+                        com.android.internal.R.id.permission_list);
+                descriptionView.setText(getString(capability.descResId));
+
+                capabilitiesView.addView(capabilityView);
+            }
+
+            return content;
         }
 
         @Override
@@ -838,23 +898,15 @@
                 @Override
                 public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
                     if (checked) {
-                        if (!TextUtils.isEmpty(mEnableWarningMessage)) {
-                            toggleSwitch.setCheckedInternal(false);
-                            getArguments().putBoolean(EXTRA_CHECKED, false);
-                            showDialog(DIALOG_ID_ENABLE_WARNING);
-                            return true;
-                        }
-                        onPreferenceToggled(mPreferenceKey, true);
+                        toggleSwitch.setCheckedInternal(false);
+                        getArguments().putBoolean(EXTRA_CHECKED, false);
+                        showDialog(DIALOG_ID_ENABLE_WARNING);
                     } else {
-                        if (!TextUtils.isEmpty(mDisableWarningMessage)) {
-                            toggleSwitch.setCheckedInternal(true);
-                            getArguments().putBoolean(EXTRA_CHECKED, true);
-                            showDialog(DIALOG_ID_DISABLE_WARNING);
-                            return true;
-                        }
-                        onPreferenceToggled(mPreferenceKey, false);
+                        toggleSwitch.setCheckedInternal(true);
+                        getArguments().putBoolean(EXTRA_CHECKED, true);
+                        showDialog(DIALOG_ID_DISABLE_WARNING);
                     }
-                    return false;
+                    return true;
                 }
             });
         }
@@ -874,20 +926,8 @@
                     setHasOptionsMenu(true);
                 }
             }
-            // Enable warning title.
-            mEnableWarningTitle = arguments.getCharSequence(
-                    AccessibilitySettings.EXTRA_ENABLE_WARNING_TITLE);
-            // Enable warning message.
-            mEnableWarningMessage = arguments.getCharSequence(
-                    AccessibilitySettings.EXTRA_ENABLE_WARNING_MESSAGE);
-            // Disable warning title.
-            mDisableWarningTitle = arguments.getString(
-                    AccessibilitySettings.EXTRA_DISABLE_WARNING_TITLE);
-            // Disable warning message.
-            mDisableWarningMessage = arguments.getString(
-                    AccessibilitySettings.EXTRA_DISABLE_WARNING_MESSAGE);
-            // Component name.
-            mComponentName = arguments.getString(EXTRA_SERVICE_COMPONENT_NAME);
+
+            mComponentName = arguments.getParcelable(EXTRA_COMPONENT_NAME);
         }
     }
 
@@ -992,8 +1032,9 @@
             super.onViewCreated(view, savedInstanceState);
             onInstallActionBarToggleSwitch();
             onProcessArguments(getArguments());
+            // Set a transparent drawable to prevent use of the default one.
+            getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
             getListView().setDivider(null);
-            getListView().setEnabled(false);
         }
 
         @Override
@@ -1024,7 +1065,7 @@
             ToggleSwitch toggleSwitch = new ToggleSwitch(activity);
             final int padding = activity.getResources().getDimensionPixelSize(
                     R.dimen.action_bar_switch_padding);
-            toggleSwitch.setPadding(0, 0, padding, 0);
+            toggleSwitch.setPaddingRelative(0, 0, padding, 0);
             activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
                     ActionBar.DISPLAY_SHOW_CUSTOM);
             activity.getActionBar().setCustomView(toggleSwitch,
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index f34abfa..2da2d76 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -94,6 +94,7 @@
     private boolean mNewApn;
     private boolean mFirstTime;
     private Resources mRes;
+    private TelephonyManager mTelephonyManager;
 
     /**
      * Standard projection for the interesting columns of a normal note.
@@ -224,6 +225,8 @@
         mCursor = managedQuery(mUri, sProjection, null, null);
         mCursor.moveToFirst();
 
+        mTelephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+
         fillUi();
     }
 
@@ -359,18 +362,30 @@
         }
     }
 
-    private String mvnoDescription(String raw) {
-        int mvnoIndex = mMvnoType.findIndexOfValue(raw);
+    private String mvnoDescription(String newValue) {
+        int mvnoIndex = mMvnoType.findIndexOfValue(newValue);
+        String oldValue = mMvnoType.getValue();
+
         if (mvnoIndex == -1) {
             return null;
         } else {
             String[] values = mRes.getStringArray(R.array.mvno_type_entries);
             if (values[mvnoIndex].equals("None")) {
                 mMvnoMatchData.setEnabled(false);
-                mMvnoMatchData.setText("");
             } else {
                 mMvnoMatchData.setEnabled(true);
             }
+            if (newValue != null && newValue.equals(oldValue) == false) {
+                if (values[mvnoIndex].equals("SPN")) {
+                    mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());
+                } else if (values[mvnoIndex].equals("IMSI")) {
+                    String numeric =
+                            SystemProperties.get(TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC);
+                    mMvnoMatchData.setText(numeric + "x");
+                } else if (values[mvnoIndex].equals("GID")) {
+                    mMvnoMatchData.setText(mTelephonyManager.getGroupIdLevel1());
+                }
+            }
 
             try {
                 return values[mvnoIndex];
diff --git a/src/com/android/settings/BrightnessPreference.java b/src/com/android/settings/BrightnessPreference.java
index 62f716f..6d3b81b 100644
--- a/src/com/android/settings/BrightnessPreference.java
+++ b/src/com/android/settings/BrightnessPreference.java
@@ -16,330 +16,21 @@
 
 package com.android.settings;
 
-import android.content.ContentResolver;
 import android.content.Context;
-import android.database.ContentObserver;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IPowerManager;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.preference.SeekBarDialogPreference;
-import android.provider.Settings;
-import android.provider.Settings.SettingNotFoundException;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.preference.Preference;
 import android.util.AttributeSet;
-import android.view.View;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.SeekBar;
 
-public class BrightnessPreference extends SeekBarDialogPreference implements
-        SeekBar.OnSeekBarChangeListener, CheckBox.OnCheckedChangeListener {
-    // If true, enables the use of the screen auto-brightness adjustment setting.
-    private static final boolean USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT =
-            PowerManager.useScreenAutoBrightnessAdjustmentFeature();
-
-    private final int mScreenBrightnessMinimum;
-    private final int mScreenBrightnessMaximum;
-
-    private SeekBar mSeekBar;
-    private CheckBox mCheckBox;
-
-    private int mOldBrightness;
-    private int mOldAutomatic;
-
-    private boolean mAutomaticAvailable;
-    private boolean mAutomaticMode;
-
-    private int mCurBrightness = -1;
-
-    private boolean mRestoredOldState;
-
-    private static final int SEEK_BAR_RANGE = 10000;
-
-    private ContentObserver mBrightnessObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-            mCurBrightness = -1;
-            onBrightnessChanged();
-        }
-    };
-
-    private ContentObserver mBrightnessModeObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-            onBrightnessModeChanged();
-        }
-    };
+public class BrightnessPreference extends Preference {
 
     public BrightnessPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-
-        PowerManager pm = (PowerManager)context.getSystemService(Context.POWER_SERVICE);
-        mScreenBrightnessMinimum = pm.getMinimumScreenBrightnessSetting();
-        mScreenBrightnessMaximum = pm.getMaximumScreenBrightnessSetting();
-
-        mAutomaticAvailable = context.getResources().getBoolean(
-                com.android.internal.R.bool.config_automatic_brightness_available);
-
-        setDialogLayoutResource(R.layout.preference_dialog_brightness);
-        setDialogIcon(R.drawable.ic_settings_display);
     }
 
     @Override
-    protected void showDialog(Bundle state) {
-        super.showDialog(state);
-
-        getContext().getContentResolver().registerContentObserver(
-                Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS), true,
-                mBrightnessObserver);
-
-        getContext().getContentResolver().registerContentObserver(
-                Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_MODE), true,
-                mBrightnessModeObserver);
-        mRestoredOldState = false;
-    }
-
-    @Override
-    protected void onBindDialogView(View view) {
-        super.onBindDialogView(view);
-
-        mSeekBar = getSeekBar(view);
-        mSeekBar.setMax(SEEK_BAR_RANGE);
-        mOldBrightness = getBrightness();
-        mSeekBar.setProgress(mOldBrightness);
-
-        mCheckBox = (CheckBox)view.findViewById(R.id.automatic_mode);
-        if (mAutomaticAvailable) {
-            mCheckBox.setOnCheckedChangeListener(this);
-            mOldAutomatic = getBrightnessMode(0);
-            mAutomaticMode = mOldAutomatic == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-            mCheckBox.setChecked(mAutomaticMode);
-            mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
-        } else {
-            mCheckBox.setVisibility(View.GONE);
-            mSeekBar.setEnabled(true);
-        }
-        mSeekBar.setOnSeekBarChangeListener(this);
-    }
-
-    public void onProgressChanged(SeekBar seekBar, int progress,
-            boolean fromTouch) {
-        setBrightness(progress, false);
-    }
-
-    public void onStartTrackingTouch(SeekBar seekBar) {
-        // NA
-    }
-
-    public void onStopTrackingTouch(SeekBar seekBar) {
-        // NA
-    }
-
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        setMode(isChecked ? Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC
-                : Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL);
-        mSeekBar.setProgress(getBrightness());
-        mSeekBar.setEnabled(!mAutomaticMode || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
-        setBrightness(mSeekBar.getProgress(), false);
-    }
-
-    private int getBrightness() {
-        int mode = getBrightnessMode(0);
-        float brightness = 0;
-        if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT
-                && mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {
-            brightness = Settings.System.getFloat(getContext().getContentResolver(),
-                    Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, 0);
-            brightness = (brightness+1)/2;
-        } else {
-            if (mCurBrightness < 0) {
-                brightness = Settings.System.getInt(getContext().getContentResolver(),
-                        Settings.System.SCREEN_BRIGHTNESS, 100);
-            } else {
-                brightness = mCurBrightness;
-            }
-            brightness = (brightness - mScreenBrightnessMinimum)
-                    / (mScreenBrightnessMaximum - mScreenBrightnessMinimum);
-        }
-        return (int)(brightness*SEEK_BAR_RANGE);
-    }
-
-    private int getBrightnessMode(int defaultValue) {
-        int brightnessMode = defaultValue;
-        try {
-            brightnessMode = Settings.System.getInt(getContext().getContentResolver(),
-                    Settings.System.SCREEN_BRIGHTNESS_MODE);
-        } catch (SettingNotFoundException snfe) {
-        }
-        return brightnessMode;
-    }
-
-    private void onBrightnessChanged() {
-        mSeekBar.setProgress(getBrightness());
-    }
-
-    private void onBrightnessModeChanged() {
-        boolean checked = getBrightnessMode(0)
-                == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-        mCheckBox.setChecked(checked);
-        mSeekBar.setProgress(getBrightness());
-        mSeekBar.setEnabled(!checked || USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT);
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        final ContentResolver resolver = getContext().getContentResolver();
-
-        if (positiveResult) {
-            setBrightness(mSeekBar.getProgress(), true);
-        } else {
-            restoreOldState();
-        }
-
-        resolver.unregisterContentObserver(mBrightnessObserver);
-        resolver.unregisterContentObserver(mBrightnessModeObserver);
-    }
-
-    private void restoreOldState() {
-        if (mRestoredOldState) return;
-
-        if (mAutomaticAvailable) {
-            setMode(mOldAutomatic);
-        }
-        setBrightness(mOldBrightness, false);
-        mRestoredOldState = true;
-        mCurBrightness = -1;
-    }
-
-    private void setBrightness(int brightness, boolean write) {
-        if (mAutomaticMode) {
-            if (USE_SCREEN_AUTO_BRIGHTNESS_ADJUSTMENT) {
-                float valf = (((float)brightness*2)/SEEK_BAR_RANGE) - 1.0f;
-                try {
-                    IPowerManager power = IPowerManager.Stub.asInterface(
-                            ServiceManager.getService("power"));
-                    if (power != null) {
-                        power.setTemporaryScreenAutoBrightnessAdjustmentSettingOverride(valf);
-                    }
-                    if (write) {
-                        final ContentResolver resolver = getContext().getContentResolver();
-                        Settings.System.putFloat(resolver,
-                                Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ, valf);
-                    }
-                } catch (RemoteException doe) {
-                }
-            }
-        } else {
-            int range = (mScreenBrightnessMaximum - mScreenBrightnessMinimum);
-            brightness = (brightness * range)/SEEK_BAR_RANGE + mScreenBrightnessMinimum;
-            try {
-                IPowerManager power = IPowerManager.Stub.asInterface(
-                        ServiceManager.getService("power"));
-                if (power != null) {
-                    power.setTemporaryScreenBrightnessSettingOverride(brightness);
-                }
-                if (write) {
-                    mCurBrightness = -1;
-                    final ContentResolver resolver = getContext().getContentResolver();
-                    Settings.System.putInt(resolver,
-                            Settings.System.SCREEN_BRIGHTNESS, brightness);
-                } else {
-                    mCurBrightness = brightness;
-                }
-            } catch (RemoteException doe) {
-            }
-        }
-    }
-
-    private void setMode(int mode) {
-        mAutomaticMode = mode == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
-        Settings.System.putInt(getContext().getContentResolver(),
-                Settings.System.SCREEN_BRIGHTNESS_MODE, mode);
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        final Parcelable superState = super.onSaveInstanceState();
-        if (getDialog() == null || !getDialog().isShowing()) return superState;
-
-        // Save the dialog state
-        final SavedState myState = new SavedState(superState);
-        myState.automatic = mCheckBox.isChecked();
-        myState.progress = mSeekBar.getProgress();
-        myState.oldAutomatic = mOldAutomatic == 1;
-        myState.oldProgress = mOldBrightness;
-        myState.curBrightness = mCurBrightness;
-
-        // Restore the old state when the activity or dialog is being paused
-        restoreOldState();
-        return myState;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state == null || !state.getClass().equals(SavedState.class)) {
-            // Didn't save state for us in onSaveInstanceState
-            super.onRestoreInstanceState(state);
-            return;
-        }
-
-        SavedState myState = (SavedState) state;
-        super.onRestoreInstanceState(myState.getSuperState());
-        mOldBrightness = myState.oldProgress;
-        mOldAutomatic = myState.oldAutomatic ? 1 : 0;
-        setMode(myState.automatic ? 1 : 0);
-        setBrightness(myState.progress, false);
-        mCurBrightness = myState.curBrightness;
-    }
-
-    private static class SavedState extends BaseSavedState {
-
-        boolean automatic;
-        boolean oldAutomatic;
-        int progress;
-        int oldProgress;
-        int curBrightness;
-
-        public SavedState(Parcel source) {
-            super(source);
-            automatic = source.readInt() == 1;
-            progress = source.readInt();
-            oldAutomatic = source.readInt() == 1;
-            oldProgress = source.readInt();
-            curBrightness = source.readInt();
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeInt(automatic ? 1 : 0);
-            dest.writeInt(progress);
-            dest.writeInt(oldAutomatic ? 1 : 0);
-            dest.writeInt(oldProgress);
-            dest.writeInt(curBrightness);
-        }
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        public static final Parcelable.Creator<SavedState> CREATOR =
-                new Parcelable.Creator<SavedState>() {
-
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
+    protected void onClick() {
+        Intent intent = new Intent(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG);
+        getContext().sendBroadcastAsUser(intent, UserHandle.CURRENT_OR_SELF);
     }
 }
-
diff --git a/src/com/android/settings/ChooseLockPassword.java b/src/com/android/settings/ChooseLockPassword.java
index aab4ba6..b16f3f6 100644
--- a/src/com/android/settings/ChooseLockPassword.java
+++ b/src/com/android/settings/ChooseLockPassword.java
@@ -395,6 +395,7 @@
                             LockPatternUtils.LOCKSCREEN_BIOMETRIC_WEAK_FALLBACK, false);
                     mLockPatternUtils.clearLock(isFallback);
                     mLockPatternUtils.saveLockPassword(pin, mRequestedQuality, isFallback);
+                    getActivity().setResult(RESULT_FINISHED);
                     getActivity().finish();
                 } else {
                     CharSequence tmp = mPasswordEntry.getText();
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 1444a73..9173e39 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -25,7 +25,6 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.RemoteException;
-import android.os.UserHandle;
 import android.security.Credentials;
 import android.security.KeyChain.KeyChainConnection;
 import android.security.KeyChain;
@@ -109,12 +108,6 @@
     protected void onResume() {
         super.onResume();
 
-        if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
-            Log.i(TAG, "Cannot install to CredentialStorage as non-primary user");
-            finish();
-            return;
-        }
-
         Intent intent = getIntent();
         String action = intent.getAction();
 
@@ -203,7 +196,7 @@
                 String key = bundle.getString(Credentials.EXTRA_USER_PRIVATE_KEY_NAME);
                 byte[] value = bundle.getByteArray(Credentials.EXTRA_USER_PRIVATE_KEY_DATA);
 
-                if (!mKeyStore.importKey(key, value, uid)) {
+                if (!mKeyStore.importKey(key, value, uid, KeyStore.FLAG_ENCRYPTED)) {
                     Log.e(TAG, "Failed to install " + key + " as user " + uid);
                     return;
                 }
@@ -213,7 +206,7 @@
                 String certName = bundle.getString(Credentials.EXTRA_USER_CERTIFICATE_NAME);
                 byte[] certData = bundle.getByteArray(Credentials.EXTRA_USER_CERTIFICATE_DATA);
 
-                if (!mKeyStore.put(certName, certData, uid)) {
+                if (!mKeyStore.put(certName, certData, uid, KeyStore.FLAG_ENCRYPTED)) {
                     Log.e(TAG, "Failed to install " + certName + " as user " + uid);
                     return;
                 }
@@ -223,7 +216,7 @@
                 String caListName = bundle.getString(Credentials.EXTRA_CA_CERTIFICATES_NAME);
                 byte[] caListData = bundle.getByteArray(Credentials.EXTRA_CA_CERTIFICATES_DATA);
 
-                if (!mKeyStore.put(caListName, caListData, uid)) {
+                if (!mKeyStore.put(caListName, caListData, uid, KeyStore.FLAG_ENCRYPTED)) {
                     Log.e(TAG, "Failed to install " + caListName + " as user " + uid);
                     return;
                 }
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 963f864..2b2cc98 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -77,7 +77,6 @@
 import android.net.NetworkStatsHistory;
 import android.net.NetworkTemplate;
 import android.net.TrafficStats;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.INetworkManagementService;
@@ -329,13 +328,14 @@
         mHeader = (ViewGroup) inflater.inflate(R.layout.data_usage_header, mListView, false);
         mHeader.setClickable(true);
 
+        mListView.addHeaderView(new View(context), null, true);
         mListView.addHeaderView(mHeader, null, true);
         mListView.setItemsCanFocus(true);
 
         if (mInsetSide > 0) {
             // inset selector and divider drawables
             insetListViewDrawables(mListView, mInsetSide);
-            mHeader.setPadding(mInsetSide, 0, mInsetSide, 0);
+            mHeader.setPaddingRelative(mInsetSide, 0, mInsetSide, 0);
         }
 
         {
@@ -454,9 +454,9 @@
         mMenuDataRoaming.setChecked(getDataRoaming());
 
         mMenuRestrictBackground = menu.findItem(R.id.data_usage_menu_restrict_background);
-        mMenuRestrictBackground.setVisible(hasReadyMobileRadio(context) && !appDetailMode);
+        mMenuRestrictBackground.setVisible(
+                hasReadyMobileRadio(context) && isOwner && !appDetailMode);
         mMenuRestrictBackground.setChecked(mPolicyManager.getRestrictBackground());
-        mMenuRestrictBackground.setVisible(isOwner);
 
         mMenuAutoSync = menu.findItem(R.id.data_usage_menu_auto_sync);
         mMenuAutoSync.setChecked(ContentResolver.getMasterSyncAutomatically());
@@ -1564,7 +1564,7 @@
                         R.layout.data_usage_item, parent, false);
 
                 if (mInsetSide > 0) {
-                    convertView.setPadding(mInsetSide, 0, mInsetSide, 0);
+                    convertView.setPaddingRelative(mInsetSide, 0, mInsetSide, 0);
                 }
             }
 
@@ -1745,6 +1745,9 @@
                     new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
+                            // clear focus to finish pending text edits
+                            cycleDayPicker.clearFocus();
+
                             final int cycleDay = cycleDayPicker.getValue();
                             final String cycleTimezone = new Time().timezone;
                             editor.setPolicyCycleDay(template, cycleDay, cycleTimezone);
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 5e7573f..4597bf0 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -35,6 +35,7 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.hardware.usb.IUsbManager;
 import android.os.AsyncTask;
 import android.os.BatteryManager;
 import android.os.Build;
@@ -45,11 +46,10 @@
 import android.os.ServiceManager;
 import android.os.StrictMode;
 import android.os.SystemProperties;
-import android.os.Trace;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
-import android.preference.MultiCheckPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceFragment;
@@ -58,12 +58,14 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
+import android.webkit.WebViewFactory;
 import android.view.Gravity;
 import android.view.HardwareRenderer;
 import android.view.IWindowManager;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.Switch;
+import android.widget.TextView;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -75,6 +77,7 @@
 public class DevelopmentSettings extends PreferenceFragment
         implements DialogInterface.OnClickListener, DialogInterface.OnDismissListener,
                 OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener {
+    private static final String TAG = "DevelopmentSettings";
 
     /**
      * Preference file were development settings prefs are stored.
@@ -87,6 +90,7 @@
     public static final String PREF_SHOW = "show";
 
     private static final String ENABLE_ADB = "enable_adb";
+    private static final String CLEAR_ADB_KEYS = "clear_adb_keys";
     private static final String KEEP_SCREEN_ON = "keep_screen_on";
     private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
     private static final String HDCP_CHECKING_KEY = "hdcp_checking";
@@ -111,6 +115,7 @@
     private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
     private static final String FORCE_MSAA_KEY = "force_msaa";
     private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
+    private static final String SHOW_NON_RECTANGULAR_CLIP_KEY = "show_non_rect_clip";
     private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
     private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
     private static final String SHOW_HW_OVERDRAW_KEY = "show_hw_overdraw";
@@ -120,9 +125,9 @@
     private static final String ANIMATOR_DURATION_SCALE_KEY = "animator_duration_scale";
     private static final String OVERLAY_DISPLAY_DEVICES_KEY = "overlay_display_devices";
     private static final String DEBUG_DEBUGGING_CATEGORY_KEY = "debug_debugging_category";
-    private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
+    private static final String DEBUG_APPLICATIONS_CATEGORY_KEY = "debug_applications_category";
 
-    private static final String ENABLE_TRACES_KEY = "enable_traces";
+    private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
 
     private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
             = "immediately_destroy_activities";
@@ -130,6 +135,8 @@
 
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
+    private static final String WEBVIEW_EXPERIMENTAL_KEY = "experimental_webview";
+
     private static final String TAG_CONFIRM_ENFORCE = "confirm_enforce";
 
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
@@ -146,6 +153,7 @@
     private boolean mDontPokeProperties;
 
     private CheckBoxPreference mEnableAdb;
+    private Preference mClearAdbKeys;
     private Preference mBugreport;
     private CheckBoxPreference mBugreportInPower;
     private CheckBoxPreference mKeepScreenOn;
@@ -166,22 +174,23 @@
     private CheckBoxPreference mShowCpuUsage;
     private CheckBoxPreference mForceHardwareUi;
     private CheckBoxPreference mForceMsaa;
-    private CheckBoxPreference mTrackFrameTime;
     private CheckBoxPreference mShowHwScreenUpdates;
     private CheckBoxPreference mShowHwLayersUpdates;
     private CheckBoxPreference mShowHwOverdraw;
     private CheckBoxPreference mDebugLayout;
+    private ListPreference mTrackFrameTime;
+    private ListPreference mShowNonRectClip;
     private ListPreference mWindowAnimationScale;
     private ListPreference mTransitionAnimationScale;
     private ListPreference mAnimatorDurationScale;
     private ListPreference mOverlayDisplayDevices;
     private ListPreference mOpenGLTraces;
-    private MultiCheckPreference mEnableTracesPref;
 
     private CheckBoxPreference mImmediatelyDestroyActivities;
     private ListPreference mAppProcessLimit;
 
     private CheckBoxPreference mShowAllANRs;
+    private CheckBoxPreference mExperimentalWebView;
 
     private final ArrayList<Preference> mAllPrefs = new ArrayList<Preference>();
     private final ArrayList<CheckBoxPreference> mResetCbPrefs
@@ -193,6 +202,9 @@
     private boolean mDialogClicked;
     private Dialog mEnableDialog;
     private Dialog mAdbDialog;
+    private Dialog mAdbKeysDialog;
+
+    private boolean mUnavailable;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -203,9 +215,24 @@
                 ServiceManager.getService(Context.BACKUP_SERVICE));
         mDpm = (DevicePolicyManager)getActivity().getSystemService(Context.DEVICE_POLICY_SERVICE);
 
+        if (android.os.Process.myUserHandle().getIdentifier() != UserHandle.USER_OWNER) {
+            mUnavailable = true;
+            setPreferenceScreen(new PreferenceScreen(getActivity(), null));
+            return;
+        }
+
         addPreferencesFromResource(R.xml.development_prefs);
 
         mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+        mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);
+        if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
+            PreferenceGroup debugDebuggingCategory = (PreferenceGroup)
+                    findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);
+            if (debugDebuggingCategory != null) {
+                debugDebuggingCategory.removePreference(mClearAdbKeys);
+            }
+        }
+
         mBugreport = findPreference(BUGREPORT);
         mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
         mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
@@ -216,6 +243,7 @@
 
         if (!android.os.Process.myUserHandle().equals(UserHandle.OWNER)) {
             disableForUser(mEnableAdb);
+            disableForUser(mClearAdbKeys);
             disableForUser(mPassword);
         }
 
@@ -240,49 +268,40 @@
         mShowCpuUsage = findAndInitCheckboxPref(SHOW_CPU_USAGE_KEY);
         mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
         mForceMsaa = findAndInitCheckboxPref(FORCE_MSAA_KEY);
-        mTrackFrameTime = findAndInitCheckboxPref(TRACK_FRAME_TIME_KEY);
+        mTrackFrameTime = addListPreference(TRACK_FRAME_TIME_KEY);
+        mShowNonRectClip = addListPreference(SHOW_NON_RECTANGULAR_CLIP_KEY);
         mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
         mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
         mShowHwOverdraw = findAndInitCheckboxPref(SHOW_HW_OVERDRAW_KEY);
         mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
-        mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
-        mAllPrefs.add(mWindowAnimationScale);
-        mWindowAnimationScale.setOnPreferenceChangeListener(this);
-        mTransitionAnimationScale = (ListPreference) findPreference(TRANSITION_ANIMATION_SCALE_KEY);
-        mAllPrefs.add(mTransitionAnimationScale);
-        mTransitionAnimationScale.setOnPreferenceChangeListener(this);
-        mAnimatorDurationScale = (ListPreference) findPreference(ANIMATOR_DURATION_SCALE_KEY);
-        mAllPrefs.add(mAnimatorDurationScale);
-        mAnimatorDurationScale.setOnPreferenceChangeListener(this);
-        mOverlayDisplayDevices = (ListPreference) findPreference(OVERLAY_DISPLAY_DEVICES_KEY);
-        mAllPrefs.add(mOverlayDisplayDevices);
-        mOverlayDisplayDevices.setOnPreferenceChangeListener(this);
-        mOpenGLTraces = (ListPreference) findPreference(OPENGL_TRACES_KEY);
-        mAllPrefs.add(mOpenGLTraces);
-        mOpenGLTraces.setOnPreferenceChangeListener(this);
-        mEnableTracesPref = (MultiCheckPreference)findPreference(ENABLE_TRACES_KEY);
-        String[] traceValues = new String[Trace.TRACE_TAGS.length];
-        for (int i=Trace.TRACE_FLAGS_START_BIT; i<traceValues.length; i++) {
-            traceValues[i] = Integer.toString(1<<i);
-        }
-        mEnableTracesPref.setEntries(Trace.TRACE_TAGS);
-        mEnableTracesPref.setEntryValues(traceValues);
-        mAllPrefs.add(mEnableTracesPref);
-        mEnableTracesPref.setOnPreferenceChangeListener(this);
+        mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
+        mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
+        mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
+        mOverlayDisplayDevices = addListPreference(OVERLAY_DISPLAY_DEVICES_KEY);
+        mOpenGLTraces = addListPreference(OPENGL_TRACES_KEY);
 
         mImmediatelyDestroyActivities = (CheckBoxPreference) findPreference(
                 IMMEDIATELY_DESTROY_ACTIVITIES_KEY);
         mAllPrefs.add(mImmediatelyDestroyActivities);
         mResetCbPrefs.add(mImmediatelyDestroyActivities);
-        mAppProcessLimit = (ListPreference) findPreference(APP_PROCESS_LIMIT_KEY);
-        mAllPrefs.add(mAppProcessLimit);
-        mAppProcessLimit.setOnPreferenceChangeListener(this);
+        mAppProcessLimit = addListPreference(APP_PROCESS_LIMIT_KEY);
 
         mShowAllANRs = (CheckBoxPreference) findPreference(
                 SHOW_ALL_ANRS_KEY);
         mAllPrefs.add(mShowAllANRs);
         mResetCbPrefs.add(mShowAllANRs);
 
+        if (WebViewFactory.isExperimentalWebViewAvailable()) {
+            mExperimentalWebView = findAndInitCheckboxPref(WEBVIEW_EXPERIMENTAL_KEY);
+        } else {
+            Preference experimentalWebView = findPreference(WEBVIEW_EXPERIMENTAL_KEY);
+            PreferenceGroup debugApplicationsCategory = (PreferenceGroup)
+                    findPreference(DEBUG_APPLICATIONS_CATEGORY_KEY);
+            if (debugApplicationsCategory != null) {
+                debugApplicationsCategory.removePreference(experimentalWebView);
+            }
+        }
+
         Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
         if (hdcpChecking != null) {
             mAllPrefs.add(hdcpChecking);
@@ -290,6 +309,13 @@
         removeHdcpOptionsForProduction();
     }
 
+    private ListPreference addListPreference(String prefKey) {
+        ListPreference pref = (ListPreference) findPreference(prefKey);
+        mAllPrefs.add(pref);
+        pref.setOnPreferenceChangeListener(this);
+        return pref;
+    }
+
     private void disableForUser(Preference pref) {
         if (pref != null) {
             pref.setEnabled(false);
@@ -316,7 +342,11 @@
 
         final int padding = activity.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
-        mEnabledSwitch.setPadding(0, 0, padding, 0);
+        mEnabledSwitch.setPaddingRelative(0, 0, padding, 0);
+        if (mUnavailable) {
+            mEnabledSwitch.setEnabled(false);
+            return;
+        }
         mEnabledSwitch.setOnCheckedChangeListener(this);
     }
 
@@ -363,6 +393,16 @@
     public void onResume() {
         super.onResume();
 
+        if (mUnavailable) {
+            // Show error message
+            TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+            getListView().setEmptyView(emptyView);
+            if (emptyView != null) {
+                emptyView.setText(R.string.development_settings_not_available);
+            }
+            return;
+        }
+
         if (mDpm.getMaximumTimeToLock(null) > 0) {
             // A DeviceAdmin has specified a maximum time until the device
             // will lock...  in this case we can't allow the user to turn
@@ -421,6 +461,7 @@
         updateHardwareUiOptions();
         updateMsaaOptions();
         updateTrackFrameTimeOptions();
+        updateShowNonRectClipOptions();
         updateShowHwScreenUpdatesOptions();
         updateShowHwLayersUpdatesOptions();
         updateShowHwOverdrawOptions();
@@ -428,10 +469,10 @@
         updateAnimationScaleOptions();
         updateOverlayDisplayDevicesOptions();
         updateOpenGLTracesOptions();
-        updateEnableTracesOptions();
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
+        updateExperimentalWebViewOptions();
         updateVerifyAppsOverUsbOptions();
         updateBugreportOptions();
     }
@@ -450,7 +491,6 @@
         writeAnimationScaleOption(1, mTransitionAnimationScale, null);
         writeAnimationScaleOption(2, mAnimatorDurationScale, null);
         writeOverlayDisplayDevicesOptions(null);
-        writeEnableTracesOptions(0);
         writeAppProcessLimitOptions(null);
         mHaveDebugSettings = false;
         updateAllOptions();
@@ -708,14 +748,54 @@
     }
 
     private void updateTrackFrameTimeOptions() {
-        updateCheckBox(mTrackFrameTime,
-                SystemProperties.getBoolean(HardwareRenderer.PROFILE_PROPERTY, false));
+        String value = SystemProperties.get(HardwareRenderer.PROFILE_PROPERTY);
+        if (value == null) {
+            value = "";
+        }
+
+        CharSequence[] values = mTrackFrameTime.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mTrackFrameTime.setValueIndex(i);
+                mTrackFrameTime.setSummary(mTrackFrameTime.getEntries()[i]);
+                return;
+            }
+        }
+        mTrackFrameTime.setValueIndex(0);
+        mTrackFrameTime.setSummary(mTrackFrameTime.getEntries()[0]);
     }
 
-    private void writeTrackFrameTimeOptions() {
+    private void writeTrackFrameTimeOptions(Object newValue) {
         SystemProperties.set(HardwareRenderer.PROFILE_PROPERTY,
-                mTrackFrameTime.isChecked() ? "true" : "false");
+                newValue == null ? "" : newValue.toString());
         pokeSystemProperties();
+        updateTrackFrameTimeOptions();
+    }
+
+    private void updateShowNonRectClipOptions() {
+        String value = SystemProperties.get(
+                HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY);
+        if (value == null) {
+            value = "hide";
+        }
+
+        CharSequence[] values = mShowNonRectClip.getEntryValues();
+        for (int i = 0; i < values.length; i++) {
+            if (value.contentEquals(values[i])) {
+                mShowNonRectClip.setValueIndex(i);
+                mShowNonRectClip.setSummary(mShowNonRectClip.getEntries()[i]);
+                return;
+            }
+        }
+        mShowNonRectClip.setValueIndex(0);
+        mShowNonRectClip.setSummary(mShowNonRectClip.getEntries()[0]);
+    }
+
+    private void writeShowNonRectClipOptions(Object newValue) {
+        SystemProperties.set(HardwareRenderer.DEBUG_SHOW_NON_RECTANGULAR_CLIP_PROPERTY,
+                newValue == null ? "" : newValue.toString());
+        pokeSystemProperties();
+        updateShowNonRectClipOptions();
     }
 
     private void updateShowHwScreenUpdatesOptions() {
@@ -919,45 +999,19 @@
             getActivity().getContentResolver(), Settings.Secure.ANR_SHOW_BACKGROUND, 0) != 0);
     }
 
-    private void updateEnableTracesOptions() {
-        long flags = SystemProperties.getLong(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS, 0);
-        String[] values = mEnableTracesPref.getEntryValues();
-        int numSet = 0;
-        for (int i=Trace.TRACE_FLAGS_START_BIT; i<values.length; i++) {
-            boolean set = (flags&(1<<i)) != 0;
-            mEnableTracesPref.setValue(i-Trace.TRACE_FLAGS_START_BIT, set);
-            if (set) {
-                numSet++;
-            }
-        }
-        if (numSet == 0) {
-            mEnableTracesPref.setSummary(R.string.enable_traces_summary_none);
-        } else if (numSet == values.length) {
-            mHaveDebugSettings = true;
-            mEnableTracesPref.setSummary(R.string.enable_traces_summary_all);
-        } else {
-            mHaveDebugSettings = true;
-            mEnableTracesPref.setSummary(getString(R.string.enable_traces_summary_num, numSet));
+    private void writeExperimentalWebViewOptions() {
+        if (mExperimentalWebView != null) {
+            SystemProperties.set(WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY,
+                    mExperimentalWebView.isChecked() ? "true" : null);
+            pokeSystemProperties();
         }
     }
 
-    private void writeEnableTracesOptions() {
-        long value = 0;
-        String[] values = mEnableTracesPref.getEntryValues();
-        for (int i=Trace.TRACE_FLAGS_START_BIT; i<values.length; i++) {
-            if (mEnableTracesPref.getValue(i-Trace.TRACE_FLAGS_START_BIT)) {
-                value |= 1<<i;
-            }
+    private void updateExperimentalWebViewOptions() {
+        if (mExperimentalWebView != null) {
+            updateCheckBox(mExperimentalWebView, SystemProperties.getBoolean(
+                    WebViewFactory.WEBVIEW_EXPERIMENTAL_PROPERTY, false));
         }
-        writeEnableTracesOptions(value);
-        // Make sure summary is updated.
-        updateEnableTracesOptions();
-    }
-
-    private void writeEnableTracesOptions(long value) {
-        SystemProperties.set(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS,
-                "0x" + Long.toString(value, 16));
-        pokeSystemProperties();
     }
 
     @Override
@@ -1026,6 +1080,13 @@
                 mVerifyAppsOverUsb.setChecked(false);
                 updateBugreportOptions();
             }
+        } else if (preference == mClearAdbKeys) {
+            if (mAdbKeysDialog != null) dismissDialogs();
+            mAdbKeysDialog = new AlertDialog.Builder(getActivity())
+                        .setMessage(R.string.adb_keys_warning_message)
+                        .setPositiveButton(android.R.string.ok, this)
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .show();
         } else if (preference == mBugreportInPower) {
             Settings.Secure.putInt(getActivity().getContentResolver(),
                     Settings.Secure.BUGREPORT_IN_POWER_MENU, 
@@ -1067,12 +1128,12 @@
             writeImmediatelyDestroyActivitiesOptions();
         } else if (preference == mShowAllANRs) {
             writeShowAllANRsOptions();
+        } else if (preference == mExperimentalWebView) {
+            writeExperimentalWebViewOptions();
         } else if (preference == mForceHardwareUi) {
             writeHardwareUiOptions();
         } else if (preference == mForceMsaa) {
             writeMsaaOptions();
-        } else if (preference == mTrackFrameTime) {
-            writeTrackFrameTimeOptions();
         } else if (preference == mShowHwScreenUpdates) {
             writeShowHwScreenUpdatesOptions();
         } else if (preference == mShowHwLayersUpdates) {
@@ -1108,8 +1169,11 @@
         } else if (preference == mOpenGLTraces) {
             writeOpenGLTracesOptions(newValue);
             return true;
-        } else if (preference == mEnableTracesPref) {
-            writeEnableTracesOptions();
+        } else if (preference == mTrackFrameTime) {
+            writeTrackFrameTimeOptions(newValue);
+            return true;
+        } else if (preference == mShowNonRectClip) {
+            writeShowNonRectClipOptions(newValue);
             return true;
         } else if (preference == mAppProcessLimit) {
             writeAppProcessLimitOptions(newValue);
@@ -1123,6 +1187,10 @@
             mAdbDialog.dismiss();
             mAdbDialog = null;
         }
+        if (mAdbKeysDialog != null) {
+            mAdbKeysDialog.dismiss();
+            mAdbKeysDialog = null;
+        }
         if (mEnableDialog != null) {
             mEnableDialog.dismiss();
             mEnableDialog = null;
@@ -1142,6 +1210,16 @@
                 // Reset the toggle
                 mEnableAdb.setChecked(false);
             }
+        } else if (dialog == mAdbKeysDialog) {
+            if (which == DialogInterface.BUTTON_POSITIVE) {
+                try {
+                    IBinder b = ServiceManager.getService(Context.USB_SERVICE);
+                    IUsbManager service = IUsbManager.Stub.asInterface(b);
+                    service.clearUsbDebuggingKeys();
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Unable to clear adb keys", e);
+                }
+            }
         } else if (dialog == mEnableDialog) {
             if (which == DialogInterface.BUTTON_POSITIVE) {
                 mDialogClicked = true;
@@ -1201,7 +1279,7 @@
                         obj.transact(IBinder.SYSPROPS_TRANSACTION, data, null, 0);
                     } catch (RemoteException e) {
                     } catch (Exception e) {
-                        Log.i("DevSettings", "Somone wrote a bad service '" + service
+                        Log.i(TAG, "Somone wrote a bad service '" + service
                                 + "' that doesn't like to be poked: " + e);
                     }
                     data.recycle();
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index c0d615c..27e7a54 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -119,7 +119,7 @@
         // Make sure the given component name is actually a valid device admin.
         List<ResolveInfo> avail = getPackageManager().queryBroadcastReceivers(
                 new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
-                0);
+                PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
         int count = avail == null ? 0 : avail.size();
         boolean found = false;
         for (int i=0; i<count; i++) {
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index 310aae7..fa1c7f4 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -43,8 +43,10 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 public class DeviceAdminSettings extends ListFragment {
     static final String TAG = "DeviceAdminSettings";
@@ -54,6 +56,7 @@
     DevicePolicyManager mDPM;
     final HashSet<ComponentName> mActiveAdmins = new HashSet<ComponentName>();
     final ArrayList<DeviceAdminInfo> mAvailableAdmins = new ArrayList<DeviceAdminInfo>();
+    String mDeviceOwnerPkg;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -70,6 +73,10 @@
     @Override
     public void onResume() {
         super.onResume();
+        mDeviceOwnerPkg = mDPM.getDeviceOwner();
+        if (mDeviceOwnerPkg != null && !mDPM.isDeviceOwner(mDeviceOwnerPkg)) {
+            mDeviceOwnerPkg = null;
+        }
         updateList();
     }
 
@@ -85,9 +92,34 @@
         mAvailableAdmins.clear();
         List<ResolveInfo> avail = getActivity().getPackageManager().queryBroadcastReceivers(
                 new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_ENABLED),
-                PackageManager.GET_META_DATA);
-        int count = avail == null ? 0 : avail.size();
-        for (int i=0; i<count; i++) {
+                PackageManager.GET_META_DATA | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
+        if (avail == null) {
+            avail = Collections.emptyList();
+        }
+
+        // Some admins listed in mActiveAdmins may not have been found by the above query.
+        // We thus add them separately.
+        Set<ComponentName> activeAdminsNotInAvail = new HashSet<ComponentName>(mActiveAdmins);
+        for (ResolveInfo ri : avail) {
+            ComponentName riComponentName =
+                    new ComponentName(ri.activityInfo.packageName, ri.activityInfo.name);
+            activeAdminsNotInAvail.remove(riComponentName);
+        }
+        if (!activeAdminsNotInAvail.isEmpty()) {
+            avail = new ArrayList<ResolveInfo>(avail);
+            PackageManager packageManager = getActivity().getPackageManager();
+            for (ComponentName unlistedActiveAdmin : activeAdminsNotInAvail) {
+                List<ResolveInfo> resolved = packageManager.queryBroadcastReceivers(
+                        new Intent().setComponent(unlistedActiveAdmin),
+                        PackageManager.GET_META_DATA
+                                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS);
+                if (resolved != null) {
+                    avail.addAll(resolved);
+                }
+            }
+        }
+
+        for (int i = 0, count = avail.size(); i < count; i++) {
             ResolveInfo ri = avail.get(i);
             try {
                 DeviceAdminInfo dpi = new DeviceAdminInfo(getActivity(), ri);
@@ -149,7 +181,13 @@
         }
 
         public boolean isEnabled(int position) {
-            return true;
+            DeviceAdminInfo info = mAvailableAdmins.get(position);
+            if (mActiveAdmins.contains(info.getComponent())
+                    && info.getPackageName().equals(mDeviceOwnerPkg)) {
+                return false;
+            } else {
+                return true;
+            }
         }
 
         public View getView(int position, View convertView, ViewGroup parent) {
@@ -181,10 +219,16 @@
             vh.icon.setImageDrawable(item.loadIcon(activity.getPackageManager()));
             vh.name.setText(item.loadLabel(activity.getPackageManager()));
             vh.checkbox.setChecked(mActiveAdmins.contains(item.getComponent()));
+            final boolean activeOwner = vh.checkbox.isChecked()
+                    && item.getPackageName().equals(mDeviceOwnerPkg);
             try {
                 vh.description.setText(item.loadDescription(activity.getPackageManager()));
             } catch (Resources.NotFoundException e) {
             }
+            vh.checkbox.setEnabled(!activeOwner);
+            vh.name.setEnabled(!activeOwner);
+            vh.description.setEnabled(!activeOwner);
+            vh.icon.setEnabled(!activeOwner);
         }
     }
 }
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index d2ff6db..ac74221 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -174,6 +174,9 @@
                 }
             }
         } else if (preference.getKey().equals(KEY_BUILD_NUMBER)) {
+            // Don't enable developer options for secondary users.
+            if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;
+
             if (mDevHitCountdown > 0) {
                 mDevHitCountdown--;
                 if (mDevHitCountdown == 0) {
diff --git a/src/com/android/settings/DreamBackend.java b/src/com/android/settings/DreamBackend.java
index 70124ef..1522705 100644
--- a/src/com/android/settings/DreamBackend.java
+++ b/src/com/android/settings/DreamBackend.java
@@ -277,6 +277,9 @@
             Log.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException);
             return null;
         }
+        if (cn != null && cn.indexOf('/') < 0) {
+            cn = resolveInfo.serviceInfo.packageName + "/" + cn;
+        }
         return cn == null ? null : ComponentName.unflattenFromString(cn);
     }
 
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 23285c0..1c8f988 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -99,7 +99,7 @@
 
         final int padding = activity.getResources().getDimensionPixelSize(
                 R.dimen.action_bar_switch_padding);
-        mSwitch.setPadding(0, 0, padding, 0);
+        mSwitch.setPaddingRelative(0, 0, padding, 0);
         activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
                 ActionBar.DISPLAY_SHOW_CUSTOM);
         activity.getActionBar().setCustomView(mSwitch, new ActionBar.LayoutParams(
@@ -123,6 +123,8 @@
 
         ListView listView = getListView();
 
+        listView.setItemsCanFocus(true);
+
         TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
         emptyView.setText(R.string.screensaver_settings_disabled_prompt);
         listView.setEmptyView(emptyView);
@@ -318,6 +320,7 @@
             settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
             settingsButton.setAlpha(dreamInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
             settingsButton.setEnabled(dreamInfo.isActive);
+            settingsButton.setFocusable(dreamInfo.isActive);
             settingsButton.setOnClickListener(new OnClickListener(){
                 @Override
                 public void onClick(View v) {
@@ -329,7 +332,8 @@
 
         private View createDreamInfoRow(ViewGroup parent) {
             final View row =  mInflater.inflate(R.layout.dream_info_row, parent, false);
-            row.setOnClickListener(new OnClickListener(){
+            final View header = row.findViewById(android.R.id.widget_frame);
+            header.setOnClickListener(new OnClickListener(){
                 @Override
                 public void onClick(View v) {
                     v.setPressed(true);
diff --git a/src/com/android/settings/KeyguardAppWidgetPickActivity.java b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
index 80dbc0c..8e08019 100644
--- a/src/com/android/settings/KeyguardAppWidgetPickActivity.java
+++ b/src/com/android/settings/KeyguardAppWidgetPickActivity.java
@@ -39,6 +39,7 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.view.IWindowManager;
@@ -515,7 +516,9 @@
                 if (mAddingToKeyguard && mAppWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID) {
                     // Found in KeyguardHostView.java
                     final int KEYGUARD_HOST_ID = 0x4B455947;
-                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID);
+                    int userId = ActivityManager.getCurrentUser();
+                    mAppWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID,
+                            userId);
                 }
                 mAppWidgetManager.bindAppWidgetId(
                         mAppWidgetId, intent.getComponent(), mExtraConfigureOptions);
@@ -579,7 +582,8 @@
             } else {
                 if (mAddingToKeyguard &&
                         mAppWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) {
-                    AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId);
+                    int userId = ActivityManager.getCurrentUser();
+                    AppWidgetHost.deleteAppWidgetIdForSystem(mAppWidgetId, userId);
                 }
                 finishDelayedAndShowLockScreen(AppWidgetManager.INVALID_APPWIDGET_ID);
             }
diff --git a/src/com/android/settings/LocalePicker.java b/src/com/android/settings/LocalePicker.java
index 8ea99a1..6600703 100644
--- a/src/com/android/settings/LocalePicker.java
+++ b/src/com/android/settings/LocalePicker.java
@@ -23,8 +23,10 @@
 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;
 
@@ -46,6 +48,15 @@
     }
 
     @Override
+    protected boolean isInDeveloperMode() {
+        final boolean showDev = getActivity().getSharedPreferences(DevelopmentSettings.PREF_FILE,
+                Context.MODE_PRIVATE).getBoolean(
+                DevelopmentSettings.PREF_SHOW,
+                android.os.Build.TYPE.equals("eng"));
+        return showDev;
+    }
+
+    @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (savedInstanceState != null && savedInstanceState.containsKey(SAVE_TARGET_LOCALE)) {
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index 0e50188..2edefdf 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -23,6 +23,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.location.LocationManager;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
@@ -92,6 +93,15 @@
         mGps = (CheckBoxPreference) root.findPreference(KEY_LOCATION_GPS);
         mAssistedGps = (CheckBoxPreference) root.findPreference(KEY_ASSISTED_GPS);
 
+        // Only enable these controls if this user is allowed to change location
+        // sharing settings.
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        boolean isToggleAllowed = !um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION);
+        if (mLocationAccess != null) mLocationAccess.setEnabled(isToggleAllowed);
+        if (mNetwork != null) mNetwork.setEnabled(isToggleAllowed);
+        if (mGps != null) mGps.setEnabled(isToggleAllowed);
+        if (mAssistedGps != null) mAssistedGps.setEnabled(isToggleAllowed);
+
         mLocationAccess.setOnPreferenceChangeListener(this);
         return root;
     }
@@ -107,6 +117,7 @@
 
         if (mSettingsObserver == null) {
             mSettingsObserver = new Observer() {
+                @Override
                 public void update(Observable o, Object arg) {
                     updateLocationToggles();
                 }
@@ -119,15 +130,20 @@
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
         final ContentResolver cr = getContentResolver();
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         if (preference == mNetwork) {
-            Settings.Secure.setLocationProviderEnabled(cr,
-                    LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
+            if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
+                Settings.Secure.setLocationProviderEnabled(cr,
+                        LocationManager.NETWORK_PROVIDER, mNetwork.isChecked());
+            }
         } else if (preference == mGps) {
             boolean enabled = mGps.isChecked();
-            Settings.Secure.setLocationProviderEnabled(cr,
-                    LocationManager.GPS_PROVIDER, enabled);
-            if (mAssistedGps != null) {
-                mAssistedGps.setEnabled(enabled);
+            if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
+                Settings.Secure.setLocationProviderEnabled(cr,
+                        LocationManager.GPS_PROVIDER, enabled);
+                if (mAssistedGps != null) {
+                    mAssistedGps.setEnabled(enabled);
+                }
             }
         } else if (preference == mAssistedGps) {
             Settings.Global.putInt(cr, Settings.Global.ASSISTED_GPS_ENABLED,
@@ -170,6 +186,10 @@
 
     /** Enable or disable all providers when the master toggle is changed. */
     private void onToggleLocationAccess(boolean checked) {
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
+            return;
+        }
         final ContentResolver cr = getContentResolver();
         Settings.Secure.setLocationProviderEnabled(cr,
                 LocationManager.GPS_PROVIDER, checked);
diff --git a/src/com/android/settings/NotificationAccessSettings.java b/src/com/android/settings/NotificationAccessSettings.java
new file mode 100644
index 0000000..07d4353
--- /dev/null
+++ b/src/com/android/settings/NotificationAccessSettings.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.ActivityManager;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.DialogInterface;
+import android.content.IntentFilter;
+import android.content.pm.PackageItemInfo;
+import android.content.pm.ServiceInfo;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.service.notification.NotificationListenerService;
+import android.util.Slog;
+import android.widget.ArrayAdapter;
+
+import android.app.ListFragment;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.HashSet;
+import java.util.List;
+
+public class NotificationAccessSettings extends ListFragment {
+    static final String TAG = NotificationAccessSettings.class.getSimpleName();
+    private static final boolean SHOW_PACKAGE_NAME = false;
+
+    private PackageManager mPM;
+    private ContentResolver mCR;
+
+    private final HashSet<ComponentName> mEnabledListeners = new HashSet<ComponentName>();
+    private ListenerListAdapter mList;
+
+    private final Uri ENABLED_NOTIFICATION_LISTENERS_URI
+            = Settings.Secure.getUriFor(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);
+
+    private final ContentObserver mSettingsObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            updateList();
+        }
+    };
+
+    private final BroadcastReceiver mPackageReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateList();
+        }
+    };
+
+    public class ListenerWarningDialogFragment extends DialogFragment {
+        static final String KEY_COMPONENT = "c";
+        static final String KEY_LABEL = "l";
+
+        public ListenerWarningDialogFragment setListenerInfo(ComponentName cn, String label) {
+            Bundle args = new Bundle();
+            args.putString(KEY_COMPONENT, cn.flattenToString());
+            args.putString(KEY_LABEL, label);
+            setArguments(args);
+
+            return this;
+        }
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            final Bundle args = getArguments();
+            final String label = args.getString(KEY_LABEL);
+            final ComponentName cn = ComponentName.unflattenFromString(args.getString(KEY_COMPONENT));
+
+            final String title = getResources().getString(
+                    R.string.notification_listener_security_warning_title, label);
+            final String summary = getResources().getString(
+                    R.string.notification_listener_security_warning_summary, label);
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(summary)
+                    .setTitle(title)
+                    .setIconAttribute(android.R.attr.alertDialogIcon)
+                    .setCancelable(true)
+                    .setPositiveButton(android.R.string.ok,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    mEnabledListeners.add(cn);
+                                    saveEnabledListeners();
+                                }
+                            })
+                    .setNegativeButton(android.R.string.cancel,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int id) {
+                                    // pass
+                                }
+                            })
+                    .create();
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mPM = getActivity().getPackageManager();
+        mCR = getActivity().getContentResolver();
+        mList = new ListenerListAdapter(getActivity());
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.notification_access_settings, container, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateList();
+
+        // listen for package changes
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addDataScheme("package");
+        getActivity().registerReceiver(mPackageReceiver, filter);
+
+        mCR.registerContentObserver(ENABLED_NOTIFICATION_LISTENERS_URI, false, mSettingsObserver);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        getActivity().unregisterReceiver(mPackageReceiver);
+        mCR.unregisterContentObserver(mSettingsObserver);
+    }
+
+    void loadEnabledListeners() {
+        mEnabledListeners.clear();
+        final String flat = Settings.Secure.getString(mCR,
+                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);
+        if (flat != null && !"".equals(flat)) {
+            final String[] names = flat.split(":");
+            for (int i = 0; i < names.length; i++) {
+                final ComponentName cn = ComponentName.unflattenFromString(names[i]);
+                if (cn != null) {
+                    mEnabledListeners.add(cn);
+                }
+            }
+        }
+    }
+
+    void saveEnabledListeners() {
+        StringBuilder sb = null;
+        for (ComponentName cn : mEnabledListeners) {
+            if (sb == null) {
+                sb = new StringBuilder();
+            } else {
+                sb.append(':');
+            }
+            sb.append(cn.flattenToString());
+        }
+        Settings.Secure.putString(mCR,
+                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS,
+                sb != null ? sb.toString() : "");
+    }
+
+    void updateList() {
+        loadEnabledListeners();
+
+        getListeners(mList, mPM);
+        mList.sort(new PackageItemInfo.DisplayNameComparator(mPM));
+
+        getListView().setAdapter(mList);
+    }
+
+    static int getListenersCount(PackageManager pm) {
+        return getListeners(null, pm);
+    }
+
+    private static int getListeners(ArrayAdapter<ServiceInfo> adapter, PackageManager pm) {
+        int listeners = 0;
+        if (adapter != null) {
+            adapter.clear();
+        }
+        final int user = ActivityManager.getCurrentUser();
+
+        List<ResolveInfo> installedServices = pm.queryIntentServicesAsUser(
+                new Intent(NotificationListenerService.SERVICE_INTERFACE),
+                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,
+                user);
+
+        for (int i = 0, count = installedServices.size(); i < count; i++) {
+            ResolveInfo resolveInfo = installedServices.get(i);
+            ServiceInfo info = resolveInfo.serviceInfo;
+
+            if (!android.Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE.equals(
+                    info.permission)) {
+                Slog.w(TAG, "Skipping notification listener service "
+                        + info.packageName + "/" + info.name
+                        + ": it does not require the permission "
+                        + android.Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE);
+                continue;
+            }
+            if (adapter != null) {
+                adapter.add(info);
+            }
+            listeners++;
+        }
+        return listeners;
+    }
+
+    boolean isListenerEnabled(ServiceInfo info) {
+        final ComponentName cn = new ComponentName(info.packageName, info.name);
+        return mEnabledListeners.contains(cn);
+    }
+
+    @Override
+    public void onListItemClick(ListView l, View v, int position, long id) {
+        ServiceInfo info = mList.getItem(position);
+        final ComponentName cn = new ComponentName(info.packageName, info.name);
+        if (mEnabledListeners.contains(cn)) {
+            // the simple version: disabling
+            mEnabledListeners.remove(cn);
+            saveEnabledListeners();
+        } else {
+            // show a scary dialog
+            new ListenerWarningDialogFragment()
+                .setListenerInfo(cn, info.loadLabel(mPM).toString())
+                .show(getFragmentManager(), "dialog");
+        }
+    }
+
+    static class ViewHolder {
+        ImageView icon;
+        TextView name;
+        CheckBox checkbox;
+        TextView description;
+    }
+
+    class ListenerListAdapter extends ArrayAdapter<ServiceInfo> {
+        final LayoutInflater mInflater;
+
+        ListenerListAdapter(Context context) {
+            super(context, 0, 0);
+            mInflater = (LayoutInflater)
+                    getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        public boolean hasStableIds() {
+            return true;
+        }
+
+        public long getItemId(int position) {
+            return position;
+        }
+
+        public View getView(int position, View convertView, ViewGroup parent) {
+            View v;
+            if (convertView == null) {
+                v = newView(parent);
+            } else {
+                v = convertView;
+            }
+            bindView(v, position);
+            return v;
+        }
+
+        public View newView(ViewGroup parent) {
+            View v = mInflater.inflate(R.layout.notification_listener_item, parent, false);
+            ViewHolder h = new ViewHolder();
+            h.icon = (ImageView) v.findViewById(R.id.icon);
+            h.name = (TextView) v.findViewById(R.id.name);
+            h.checkbox = (CheckBox) v.findViewById(R.id.checkbox);
+            h.description = (TextView) v.findViewById(R.id.description);
+            v.setTag(h);
+            return v;
+        }
+
+        public void bindView(View view, int position) {
+            ViewHolder vh = (ViewHolder) view.getTag();
+            ServiceInfo info = getItem(position);
+
+            vh.icon.setImageDrawable(info.loadIcon(mPM));
+            vh.name.setText(info.loadLabel(mPM));
+            if (SHOW_PACKAGE_NAME) {
+                vh.description.setText(info.packageName);
+                vh.description.setVisibility(View.VISIBLE);
+            } else {
+                vh.description.setVisibility(View.GONE);
+            }
+            vh.checkbox.setChecked(isListenerEnabled(info));
+        }
+    }
+}
diff --git a/src/com/android/settings/NotificationStation.java b/src/com/android/settings/NotificationStation.java
new file mode 100644
index 0000000..10457b9
--- /dev/null
+++ b/src/com/android/settings/NotificationStation.java
@@ -0,0 +1,401 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.content.ComponentName;
+import android.service.notification.INotificationListener;
+import android.app.INotificationManager;
+import android.app.Notification;
+import android.service.notification.StatusBarNotification;
+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.PackageManager;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.DateTimeView;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+public class NotificationStation extends SettingsPreferenceFragment {
+    private static final String TAG = NotificationStation.class.getSimpleName();
+    static final boolean DEBUG = true;
+    private static final String PACKAGE_SCHEME = "package";
+    private static final boolean SHOW_HISTORICAL_NOTIFICATIONS = true;
+
+    private final PackageReceiver mPackageReceiver = new PackageReceiver();
+    private PackageManager mPm;
+    private INotificationManager mNoMan;
+
+    private Runnable mRefreshListRunnable = new Runnable() {
+        @Override
+        public void run() {
+            refreshList();
+        }
+    };
+
+    private INotificationListener.Stub mListener = new INotificationListener.Stub() {
+        @Override
+        public void onNotificationPosted(StatusBarNotification notification) throws RemoteException {
+            Log.v(TAG, "onNotificationPosted: " + notification);
+            final Handler h = getListView().getHandler();
+            h.removeCallbacks(mRefreshListRunnable);
+            h.postDelayed(mRefreshListRunnable, 100);
+        }
+
+        @Override
+        public void onNotificationRemoved(StatusBarNotification notification) throws RemoteException {
+            final Handler h = getListView().getHandler();
+            h.removeCallbacks(mRefreshListRunnable);
+            h.postDelayed(mRefreshListRunnable, 100);
+        }
+    };
+
+    private NotificationHistoryAdapter mAdapter;
+    private Context mContext;
+
+    private final Comparator<HistoricalNotificationInfo> mNotificationSorter
+            = new Comparator<HistoricalNotificationInfo>() {
+                @Override
+                public int compare(HistoricalNotificationInfo lhs,
+                                   HistoricalNotificationInfo rhs) {
+                    return (int)(rhs.timestamp - lhs.timestamp);
+                }
+            };
+
+    @Override
+    public void onAttach(Activity activity) {
+        logd("onAttach(%s)", activity.getClass().getSimpleName());
+        super.onAttach(activity);
+        mContext = activity;
+        mPm = mContext.getPackageManager();
+        mNoMan = INotificationManager.Stub.asInterface(
+                ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+        try {
+            mNoMan.registerListener(mListener,
+                    new ComponentName(mContext.getPackageName(),
+                            this.getClass().getCanonicalName()),
+                    ActivityManager.getCurrentUser());
+        } catch (RemoteException e) {
+            // well, that didn't work out
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        logd("onCreate(%s)", icicle);
+        super.onCreate(icicle);
+        Activity activity = getActivity();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        logd("onActivityCreated(%s)", savedInstanceState);
+        super.onActivityCreated(savedInstanceState);
+
+        ListView listView = getListView();
+
+//        TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+//        emptyView.setText(R.string.screensaver_settings_disabled_prompt);
+//        listView.setEmptyView(emptyView);
+
+        mAdapter = new NotificationHistoryAdapter(mContext);
+        listView.setAdapter(mAdapter);
+    }
+
+    @Override
+    public void onPause() {
+        logd("onPause()");
+        super.onPause();
+        mContext.unregisterReceiver(mPackageReceiver);
+    }
+
+    @Override
+    public void onResume() {
+        logd("onResume()");
+        super.onResume();
+        refreshList();
+
+        // listen for package changes
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_ADDED);
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+        filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
+        filter.addDataScheme(PACKAGE_SCHEME);
+        mContext.registerReceiver(mPackageReceiver , filter);
+    }
+
+    private void refreshList() {
+        List<HistoricalNotificationInfo> infos = loadNotifications();
+        if (infos != null) {
+            logd("adding %d infos", infos.size());
+            mAdapter.clear();
+            mAdapter.addAll(infos);
+            mAdapter.sort(mNotificationSorter);
+        }
+    }
+
+    private static void logd(String msg, Object... args) {
+        if (DEBUG)
+            Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
+    }
+
+    private static class HistoricalNotificationInfo {
+        public String pkg;
+        public Drawable pkgicon;
+        public CharSequence pkgname;
+        public Drawable icon;
+        public CharSequence title;
+        public int priority;
+        public int user;
+        public long timestamp;
+        public boolean active;
+    }
+
+    private List<HistoricalNotificationInfo> loadNotifications() {
+        final int currentUserId = ActivityManager.getCurrentUser();
+        try {
+            StatusBarNotification[] active = mNoMan.getActiveNotifications(mContext.getPackageName());
+            StatusBarNotification[] dismissed = mNoMan.getHistoricalNotifications(mContext.getPackageName(), 50);
+
+            List<HistoricalNotificationInfo> list
+                    = new ArrayList<HistoricalNotificationInfo>(active.length + dismissed.length);
+
+            for (StatusBarNotification[] resultset
+                    : new StatusBarNotification[][] { active, dismissed }) {
+                for (StatusBarNotification sbn : resultset) {
+                    final HistoricalNotificationInfo info = new HistoricalNotificationInfo();
+                    info.pkg = sbn.getPackageName();
+                    info.user = sbn.getUserId();
+                    info.icon = loadIconDrawable(info.pkg, info.user, sbn.getNotification().icon);
+                    info.pkgicon = loadPackageIconDrawable(info.pkg, info.user);
+                    info.pkgname = loadPackageName(info.pkg);
+                    if (sbn.getNotification().extras != null) {
+                        info.title = sbn.getNotification().extras.getString(Notification.EXTRA_TITLE);
+                        if (info.title == null || "".equals(info.title)) {
+                            info.title = sbn.getNotification().extras.getString(Notification.EXTRA_TEXT);
+                        }
+                    }
+                    if (info.title == null || "".equals(info.title)) {
+                        info.title = sbn.getNotification().tickerText;
+                    }
+                    // still nothing? come on, give us something!
+                    if (info.title == null || "".equals(info.title)) {
+                        info.title = info.pkgname;
+                    }
+                    info.timestamp = sbn.getPostTime();
+                    info.priority = sbn.getNotification().priority;
+                    logd("   [%d] %s: %s", info.timestamp, info.pkg, info.title);
+
+                    info.active = (resultset == active);
+
+                    if (info.user == UserHandle.USER_ALL
+                            || info.user == currentUserId) {
+                        list.add(info);
+                    }
+                }
+            }
+
+            return list;
+        } catch (RemoteException e) {
+            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+        }
+        return null;
+    }
+
+    private Resources getResourcesForUserPackage(String pkg, int userId) {
+        Resources r = null;
+
+        if (pkg != null) {
+            try {
+                if (userId == UserHandle.USER_ALL) {
+                    userId = UserHandle.USER_OWNER;
+                }
+                r = mPm.getResourcesForApplicationAsUser(pkg, userId);
+            } catch (PackageManager.NameNotFoundException ex) {
+                Log.e(TAG, "Icon package not found: " + pkg);
+                return null;
+            }
+        } else {
+            r = mContext.getResources();
+        }
+        return r;
+    }
+
+    private Drawable loadPackageIconDrawable(String pkg, int userId) {
+        Drawable icon = null;
+        try {
+            icon = mPm.getApplicationIcon(pkg);
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+
+        return icon;
+    }
+
+    private CharSequence loadPackageName(String pkg) {
+        try {
+            ApplicationInfo info = mPm.getApplicationInfo(pkg,
+                    PackageManager.GET_UNINSTALLED_PACKAGES);
+            if (info != null) return mPm.getApplicationLabel(info);
+        } catch (PackageManager.NameNotFoundException e) {
+        }
+        return pkg;
+    }
+
+    private Drawable loadIconDrawable(String pkg, int userId, int resId) {
+        Resources r = getResourcesForUserPackage(pkg, userId);
+
+        if (resId == 0) {
+            return null;
+        }
+
+        try {
+            return r.getDrawable(resId);
+        } catch (RuntimeException e) {
+            Log.w(TAG, "Icon not found in "
+                    + (pkg != null ? resId : "<system>")
+                    + ": " + Integer.toHexString(resId));
+        }
+
+        return null;
+    }
+
+    private class NotificationHistoryAdapter extends ArrayAdapter<HistoricalNotificationInfo> {
+        private final LayoutInflater mInflater;
+
+        public NotificationHistoryAdapter(Context context) {
+            super(context, 0);
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final HistoricalNotificationInfo info = getItem(position);
+            logd("getView(%s/%s)", info.pkg, info.title);
+            final View row = convertView != null ? convertView : createRow(parent);
+            row.setTag(info);
+
+            // bind icon
+            if (info.icon != null) {
+                ((ImageView) row.findViewById(android.R.id.icon)).setImageDrawable(info.icon);
+            }
+            if (info.pkgicon != null) {
+                ((ImageView) row.findViewById(R.id.pkgicon)).setImageDrawable(info.pkgicon);
+            }
+
+            ((DateTimeView) row.findViewById(R.id.timestamp)).setTime(info.timestamp);
+
+            // bind caption
+            ((TextView) row.findViewById(android.R.id.title)).setText(info.title);
+
+            // app name
+            ((TextView) row.findViewById(R.id.pkgname)).setText(info.pkgname);
+
+            // extra goodies -- not implemented yet
+//            ((TextView) row.findViewById(R.id.extra)).setText(
+//              ...
+//            );
+            row.findViewById(R.id.extra).setVisibility(View.GONE);
+
+            row.setAlpha(info.active ? 1.0f : 0.5f);
+
+            // set up click handler
+            row.setOnClickListener(new OnClickListener(){
+                @Override
+                public void onClick(View v) {
+                    v.setPressed(true);
+                    startApplicationDetailsActivity(info.pkg);
+                }});
+
+//            // bind radio button
+//            RadioButton radioButton = (RadioButton) row.findViewById(android.R.id.button1);
+//            radioButton.setChecked(dreamInfo.isActive);
+//            radioButton.setOnTouchListener(new OnTouchListener() {
+//                @Override
+//                public boolean onTouch(View v, MotionEvent event) {
+//                    row.onTouchEvent(event);
+//                    return false;
+//                }});
+
+            // bind settings button + divider
+//            boolean showSettings = info.
+//                    settingsComponentName != null;
+//            View settingsDivider = row.findViewById(R.id.divider);
+//            settingsDivider.setVisibility(false ? View.VISIBLE : View.INVISIBLE);
+//
+//            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+//            settingsButton.setVisibility(false ? View.VISIBLE : View.INVISIBLE);
+//            settingsButton.setAlpha(info.isActive ? 1f : Utils.DISABLED_ALPHA);
+//            settingsButton.setEnabled(info.isActive);
+//            settingsButton.setOnClickListener(new OnClickListener(){
+//                @Override
+//                public void onClick(View v) {
+//                    mBackend.launchSettings((DreamInfo) row.getTag());
+//                }});
+
+            return row;
+        }
+
+        private View createRow(ViewGroup parent) {
+            final View row =  mInflater.inflate(R.layout.notification_log_row, parent, false);
+            return row;
+        }
+
+    }
+
+    private void startApplicationDetailsActivity(String packageName) {
+        Intent intent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
+                Uri.fromParts("package", packageName, null));
+        intent.setComponent(intent.resolveActivity(mPm));
+        startActivity(intent);
+    }
+
+    private class PackageReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            logd("PackageReceiver.onReceive");
+            //refreshList();
+        }
+    }
+}
diff --git a/src/com/android/settings/OwnerInfoSettings.java b/src/com/android/settings/OwnerInfoSettings.java
index 2d44921..2f7721b 100644
--- a/src/com/android/settings/OwnerInfoSettings.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -20,7 +20,9 @@
 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;
 import android.view.ViewGroup;
@@ -29,37 +31,66 @@
 import android.widget.EditText;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
+import com.android.internal.widget.LockPatternUtils;
+
 public class OwnerInfoSettings extends Fragment {
+
+    public static final String EXTRA_SHOW_NICKNAME = "show_nickname";
+
     private View mView;
     private CheckBox mCheckbox;
-    private EditText mEditText;
+    private int mUserId;
+    private LockPatternUtils mLockPatternUtils;
+    private EditText mOwnerInfo;
+    private EditText mNickname;
+    private boolean mShowNickname;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Bundle args = getArguments();
+        if (args != null && args.containsKey(EXTRA_SHOW_NICKNAME)) {
+            mShowNickname = args.getBoolean(EXTRA_SHOW_NICKNAME);
+        }
+    }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         mView = inflater.inflate(R.layout.ownerinfo, container, false);
+        mUserId = UserHandle.myUserId();
+        mLockPatternUtils = new LockPatternUtils(getActivity());
         initView(mView);
         return mView;
     }
 
     private void initView(View view) {
         final ContentResolver res = getActivity().getContentResolver();
-        String info = Settings.Secure.getString(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO);
-        int enabled = Settings.Secure.getInt(res,
-                Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED, 1);
+        String info = mLockPatternUtils.getOwnerInfo(mUserId);
+        boolean enabled = mLockPatternUtils.isOwnerInfoEnabled();
         mCheckbox = (CheckBox) mView.findViewById(R.id.show_owner_info_on_lockscreen_checkbox);
-        mEditText = (EditText) mView.findViewById(R.id.owner_info_edit_text);
-        mEditText.setText(info);
-        mEditText.setEnabled(enabled != 0);
-        mCheckbox.setChecked(enabled != 0);
+        mOwnerInfo = (EditText) mView.findViewById(R.id.owner_info_edit_text);
+        mOwnerInfo.setText(info);
+        mOwnerInfo.setEnabled(enabled);
+        mNickname = (EditText) mView.findViewById(R.id.owner_info_nickname);
+        if (!mShowNickname) {
+            mNickname.setVisibility(View.GONE);
+        } else {
+            mNickname.setText(UserManager.get(getActivity()).getUserName());
+            mNickname.setSelected(true);
+        }
+        mCheckbox.setChecked(enabled);
         if (UserHandle.myUserId() != UserHandle.USER_OWNER) {
-            mCheckbox.setText(R.string.show_user_info_on_lockscreen_label);
+            if (UserManager.get(getActivity()).isLinkedUser()) {
+                mCheckbox.setText(R.string.show_profile_info_on_lockscreen_label);
+            } else {
+                mCheckbox.setText(R.string.show_user_info_on_lockscreen_label);
+            }
         }
         mCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                Settings.Secure.putInt(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED,
-                        isChecked ? 1 : 0);
-                mEditText.setEnabled(isChecked); // disable text field if not enabled
+                mLockPatternUtils.setOwnerInfoEnabled(isChecked);
+                mOwnerInfo.setEnabled(isChecked); // disable text field if not enabled
             }
         });
     }
@@ -67,13 +98,21 @@
     @Override
     public void onPause() {
         super.onPause();
-        saveToDb();
+        saveChanges();
     }
 
-    void saveToDb() {
+    void saveChanges() {
         ContentResolver res = getActivity().getContentResolver();
-        String info = mEditText.getText().toString();
-        Settings.Secure.putString(res, Settings.Secure.LOCK_SCREEN_OWNER_INFO, info);
+        String info = mOwnerInfo.getText().toString();
+        mLockPatternUtils.setOwnerInfo(info, mUserId);
+        if (mShowNickname) {
+            String oldName = UserManager.get(getActivity()).getUserName();
+            CharSequence newName = mNickname.getText();
+            if (!TextUtils.isEmpty(newName) && !newName.equals(oldName)) {
+                UserManager.get(getActivity()).setUserName(UserHandle.myUserId(),
+                        newName.toString());
+            }
+        }
     }
 
 }
diff --git a/src/com/android/settings/ProxySelector.java b/src/com/android/settings/ProxySelector.java
index f521d6d..21e717a 100644
--- a/src/com/android/settings/ProxySelector.java
+++ b/src/com/android/settings/ProxySelector.java
@@ -58,12 +58,16 @@
     Button      mClearButton;
     Button      mDefaultButton;
 
+    // Allows underscore char to supports proxies that do not
+    // follow the spec
+    private static final String HC = "a-zA-Z0-9\\_";
+
     // Matches blank input, ips, and domain names
     private static final String HOSTNAME_REGEXP =
-            "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
+            "^$|^[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
     private static final Pattern HOSTNAME_PATTERN;
     private static final String EXCLUSION_REGEXP =
-            "$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";
+            "$|^(\\*)?\\.?[" + HC + "]+(\\-[" + HC + "]+)*(\\.[" + HC + "]+(\\-[" + HC + "]+)*)*$";
     private static final Pattern EXCLUSION_PATTERN;
     static {
         HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index d72508a..df93626 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -23,15 +23,12 @@
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
-import android.net.LinkProperties;
 import android.net.TrafficStats;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.RemoteException;
-import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.telephony.CellInfo;
 import android.telephony.CellLocation;
@@ -41,7 +38,6 @@
 import android.telephony.NeighboringCellInfo;
 import android.telephony.cdma.CdmaCellLocation;
 import android.telephony.gsm.GsmCellLocation;
-import android.text.format.DateUtils;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -54,27 +50,21 @@
 import android.widget.TextView;
 import android.widget.EditText;
 
-import com.android.internal.telephony.DataConnection;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.PhoneStateIntentReceiver;
 import com.android.internal.telephony.TelephonyProperties;
-import com.android.internal.telephony.gsm.GsmDataConnection;
-
 import org.apache.http.HttpResponse;
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 
 import java.io.IOException;
-import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 
-import android.util.Log;
-
 public class RadioInfo extends Activity {
     private final String TAG = "phone";
 
@@ -126,6 +116,7 @@
     private TextView dnsCheckState;
     private EditText smsc;
     private Button radioPowerButton;
+    private Button cellInfoListRateButton;
     private Button dnsCheckToggleButton;
     private Button pingTestButton;
     private Button updateSmscButton;
@@ -177,9 +168,8 @@
 
         @Override
         public void onCellInfoChanged(List<CellInfo> arrayCi) {
-            Log.d(TAG, "[RadioInfo] onCellInfoChanged: arrayCi=" + arrayCi);
-            mCellInfoValue = arrayCi;
-            updateCellInfoTv();
+            log("onCellInfoChanged: arrayCi=" + arrayCi);
+            updateCellInfoTv(arrayCi);
         }
     };
 
@@ -205,7 +195,7 @@
                     if (ar.exception == null) {
                         int type = ((int[])ar.result)[0];
                         if (type >= mPreferredNetworkLabels.length) {
-                            Log.e(TAG, "[RadioInfo] EVENT_QUERY_PREFERRED_TYPE_DONE: unknown " +
+                            log("EVENT_QUERY_PREFERRED_TYPE_DONE: unknown " +
                                     "type=" + type);
                             type = mPreferredNetworkLabels.length - 1;
                         }
@@ -299,6 +289,9 @@
         radioPowerButton = (Button) findViewById(R.id.radio_power);
         radioPowerButton.setOnClickListener(mPowerButtonHandler);
 
+        cellInfoListRateButton = (Button) findViewById(R.id.cell_info_list_rate);
+        cellInfoListRateButton.setOnClickListener(mCellInfoListRateHandler);
+
         imsRegRequiredButton = (Button) findViewById(R.id.ims_reg_required);
         imsRegRequiredButton.setOnClickListener(mImsRegRequiredHandler);
 
@@ -340,7 +333,7 @@
 
         // Get current cell info
         mCellInfoValue = mTelephonyManager.getAllCellInfo();
-        Log.d(TAG, "[RadioInfo] onCreate: mCellInfoValue=" + mCellInfoValue);
+        log("onCreate: mCellInfoValue=" + mCellInfoValue);
     }
 
     @Override
@@ -357,13 +350,14 @@
         updateDataStats();
         updateDataStats2();
         updatePowerState();
+        updateCellInfoListRate();
         updateImsRegRequiredState();
         updateSmsOverImsState();
         updateLteRamDumpState();
         updateProperties();
         updateDnsCheckState();
 
-        Log.i(TAG, "[RadioInfo] onResume: register phone & data intents");
+        log("onResume: register phone & data intents");
 
         mPhoneStateReceiver.registerIntent();
         mTelephonyManager.listen(mPhoneStateListener,
@@ -379,7 +373,7 @@
     public void onPause() {
         super.onPause();
 
-        Log.i(TAG, "[RadioInfo] onPause: unregister phone & data intents");
+        log("onPause: unregister phone & data intents");
 
         mPhoneStateReceiver.unregisterIntent();
         mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
@@ -437,6 +431,11 @@
         radioPowerButton.setText(buttonText);
     }
 
+    private void updateCellInfoListRate() {
+        cellInfoListRateButton.setText("CellInfoListRate " + mCellInfoListRateHandler.getRate());
+        updateCellInfoTv(mTelephonyManager.getAllCellInfo());
+    }
+
     private void updateDnsCheckState() {
         dnsCheckState.setText(phone.isDnsCheckDisabled() ?
                 "0.0.0.0 allowed" :"0.0.0.0 not allowed");
@@ -524,7 +523,8 @@
         mNeighboringCids.setText(sb.toString());
     }
 
-    private final void updateCellInfoTv() {
+    private final void updateCellInfoTv(List<CellInfo> arrayCi) {
+        mCellInfoValue = arrayCi;
         StringBuilder value = new StringBuilder();
         if (mCellInfoValue != null) {
             int index = 0;
@@ -928,12 +928,32 @@
         }
     };
 
+    class CellInfoListRateHandler implements OnClickListener {
+        int rates[] = {Integer.MAX_VALUE, 0, 1000};
+        int index = 0;
+
+        public int getRate() {
+            return rates[index];
+        }
+
+        @Override
+        public void onClick(View v) {
+            index += 1;
+            if (index >= rates.length) {
+                index = 0;
+            }
+            phone.setCellInfoListRate(rates[index]);
+            updateCellInfoListRate();
+        }
+    }
+    CellInfoListRateHandler mCellInfoListRateHandler = new CellInfoListRateHandler();
+
     private Button imsRegRequiredButton;
     static final String PROPERTY_IMS_REG_REQUIRED = "persist.radio.imsregrequired";
     OnClickListener mImsRegRequiredHandler = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            Log.d(TAG, String.format("toggle %s: currently %s",
+            log(String.format("toggle %s: currently %s",
                 PROPERTY_IMS_REG_REQUIRED, (isImsRegRequired() ? "on":"off")));
             boolean newValue = !isImsRegRequired();
             SystemProperties.set(PROPERTY_IMS_REG_REQUIRED,
@@ -947,7 +967,7 @@
     }
 
     private void updateImsRegRequiredState() {
-        Log.d(TAG, "updateImsRegRequiredState isImsRegRequired()=" + isImsRegRequired());
+        log("updateImsRegRequiredState isImsRegRequired()=" + isImsRegRequired());
         String buttonText = isImsRegRequired() ?
                             getString(R.string.ims_reg_required_off) :
                             getString(R.string.ims_reg_required_on);
@@ -959,7 +979,7 @@
     OnClickListener mSmsOverImsHandler = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            Log.d(TAG, String.format("toggle %s: currently %s",
+            log(String.format("toggle %s: currently %s",
                     PROPERTY_SMS_OVER_IMS, (isSmsOverImsEnabled() ? "on":"off")));
             boolean newValue = !isSmsOverImsEnabled();
             SystemProperties.set(PROPERTY_SMS_OVER_IMS, newValue ? "1":"0");
@@ -972,7 +992,7 @@
     }
 
     private void updateSmsOverImsState() {
-        Log.d(TAG, "updateSmsOverImsState isSmsOverImsEnabled()=" + isSmsOverImsEnabled());
+        log("updateSmsOverImsState isSmsOverImsEnabled()=" + isSmsOverImsEnabled());
         String buttonText = isSmsOverImsEnabled() ?
                             getString(R.string.sms_over_ims_off) :
                             getString(R.string.sms_over_ims_on);
@@ -984,7 +1004,7 @@
     OnClickListener mLteRamDumpHandler = new OnClickListener() {
         @Override
         public void onClick(View v) {
-            Log.d(TAG, String.format("toggle %s: currently %s",
+            log(String.format("toggle %s: currently %s",
                     PROPERTY_LTE_RAM_DUMP, (isSmsOverImsEnabled() ? "on":"off")));
             boolean newValue = !isLteRamDumpEnabled();
             SystemProperties.set(PROPERTY_LTE_RAM_DUMP, newValue ? "1":"0");
@@ -997,7 +1017,7 @@
     }
 
     private void updateLteRamDumpState() {
-        Log.d(TAG, "updateLteRamDumpState isLteRamDumpEnabled()=" + isLteRamDumpEnabled());
+        log("updateLteRamDumpState isLteRamDumpEnabled()=" + isLteRamDumpEnabled());
         String buttonText = isLteRamDumpEnabled() ?
                             getString(R.string.lte_ram_dump_off) :
                             getString(R.string.lte_ram_dump_on);
@@ -1017,7 +1037,7 @@
             try {
                 startActivity(intent);
             } catch (android.content.ActivityNotFoundException ex) {
-                Log.d(TAG, "OEM-specific Info/Settings Activity Not Found : " + ex);
+                log("OEM-specific Info/Settings Activity Not Found : " + ex);
                 // If the activity does not exist, there are no OEM
                 // settings, and so we can just do nothing...
             }
@@ -1071,4 +1091,8 @@
             "LTE/GSM/CDMA auto (PRL)",
             "LTE only",
             "Unknown"};
+
+    private void log(String s) {
+        Log.d(TAG, "[RadioInfo] " + s);
+    }
 }
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
new file mode 100644
index 0000000..8adecf1
--- /dev/null
+++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.widget.TextView;
+
+/**
+ * {@link Activity} that displays regulatory information for the "Regulatory information"
+ * preference item, and when "*#07#" is dialed on the Phone keypad. To enable this feature,
+ * set the "config_show_regulatory_info" boolean to true in a device overlay resource, and in the
+ * same overlay, either add a drawable named "regulatory_info.png" containing a graphical version
+ * of the required regulatory info, or add a string resource named "regulatory_info_text" with
+ * an HTML version of the required information (text will be centered in the dialog).
+ */
+public class RegulatoryInfoDisplayActivity extends Activity implements
+        DialogInterface.OnDismissListener {
+
+    /**
+     * Display the regulatory info graphic in a dialog window.
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Resources resources = getResources();
+
+        if (!resources.getBoolean(R.bool.config_show_regulatory_info)) {
+            finish();   // no regulatory info to display for this device
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this)
+                .setTitle(R.string.regulatory_information)
+                .setOnDismissListener(this);
+
+        boolean regulatoryInfoDrawableExists;
+        try {
+            Drawable d = resources.getDrawable(R.drawable.regulatory_info);
+            // set to false if the width or height is <= 2
+            // (missing PNG can return an empty 2x2 pixel Drawable)
+            regulatoryInfoDrawableExists = (d.getIntrinsicWidth() > 2
+                    && d.getIntrinsicHeight() > 2);
+        } catch (Resources.NotFoundException ignored) {
+            regulatoryInfoDrawableExists = false;
+        }
+
+        CharSequence regulatoryText = resources.getText(R.string.regulatory_info_text);
+
+        if (regulatoryInfoDrawableExists) {
+            builder.setView(getLayoutInflater().inflate(R.layout.regulatory_info, null));
+            builder.show();
+        } else if (regulatoryText.length() > 0) {
+            builder.setMessage(regulatoryText);
+            AlertDialog dialog = builder.show();
+            // we have to show the dialog first, or the setGravity() call will throw a NPE
+            TextView messageText = (TextView) dialog.findViewById(android.R.id.message);
+            messageText.setGravity(Gravity.CENTER);
+        } else {
+            // neither drawable nor text resource exists, finish activity
+            finish();
+        }
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        finish();   // close the activity
+    }
+}
diff --git a/src/com/android/settings/RegulatoryInfoPreference.java b/src/com/android/settings/RegulatoryInfoPreference.java
deleted file mode 100644
index f1a6b77..0000000
--- a/src/com/android/settings/RegulatoryInfoPreference.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import android.content.Context;
-import android.preference.DialogPreference;
-import android.util.AttributeSet;
-
-/**
- * {@link DialogPreference} that displays regulatory information. "About phone"
- * will show a "Regulatory information" preference if
- * R.bool.config_show_regulatory_info is true.
- */
-public class RegulatoryInfoPreference extends DialogPreference {
-
-    public RegulatoryInfoPreference(Context context, AttributeSet attrs) {
-        super(context, attrs, com.android.internal.R.attr.preferenceStyle);
-        setDialogLayoutResource(R.layout.regulatory_info);
-    }
-}
diff --git a/src/com/android/settings/RingerVolumePreference.java b/src/com/android/settings/RingerVolumePreference.java
index 954213d..56393e0 100644
--- a/src/com/android/settings/RingerVolumePreference.java
+++ b/src/com/android/settings/RingerVolumePreference.java
@@ -115,7 +115,8 @@
             boolean muted = mAudioManager.isStreamMute(streamType);
 
             if (mCheckBoxes[i] != null) {
-                if ((streamType == AudioManager.STREAM_RING) &&
+                if (((streamType == AudioManager.STREAM_RING) ||
+                        (streamType == AudioManager.STREAM_NOTIFICATION)) &&
                         (mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE)) {
                     mCheckBoxes[i].setImageResource(
                             com.android.internal.R.drawable.ic_audio_ring_notif_vibrate);
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index b51f2f3..948aded 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -73,13 +73,16 @@
     // Misc Settings
     private static final String KEY_SIM_LOCK = "sim_lock";
     private static final String KEY_SHOW_PASSWORD = "show_password";
+    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
     private static final String KEY_RESET_CREDENTIALS = "reset_credentials";
     private static final String KEY_TOGGLE_INSTALL_APPLICATIONS = "toggle_install_applications";
     private static final String KEY_TOGGLE_VERIFY_APPLICATIONS = "toggle_verify_applications";
     private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
     private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
+    private static final String KEY_NOTIFICATION_ACCESS = "manage_notification_access";
     private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
 
+    private PackageManager mPM;
     DevicePolicyManager mDPM;
 
     private ChooseLockSettingsHelper mChooseLockSettingsHelper;
@@ -91,6 +94,7 @@
 
     private CheckBoxPreference mShowPassword;
 
+    private KeyStore mKeyStore;
     private Preference mResetCredentials;
 
     private CheckBoxPreference mToggleAppInstallation;
@@ -98,6 +102,8 @@
     private CheckBoxPreference mToggleVerifyApps;
     private CheckBoxPreference mPowerButtonInstantlyLocks;
 
+    private Preference mNotificationAccess;
+
     private boolean mIsPrimary;
 
     @Override
@@ -106,6 +112,7 @@
 
         mLockPatternUtils = new LockPatternUtils(getActivity());
 
+        mPM = getActivity().getPackageManager();
         mDPM = (DevicePolicyManager)getSystemService(Context.DEVICE_POLICY_SERVICE);
 
         mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
@@ -163,7 +170,11 @@
             // Rename owner info settings
             Preference ownerInfoPref = findPreference(KEY_OWNER_INFO_SETTINGS);
             if (ownerInfoPref != null) {
-                ownerInfoPref.setTitle(R.string.user_info_settings_title);
+                if (UserManager.get(getActivity()).isLinkedUser()) {
+                    ownerInfoPref.setTitle(R.string.profile_info_settings_title);
+                } else {
+                    ownerInfoPref.setTitle(R.string.user_info_settings_title);
+                }
             }
         }
 
@@ -229,17 +240,32 @@
         // Show password
         mShowPassword = (CheckBoxPreference) root.findPreference(KEY_SHOW_PASSWORD);
 
-        // Credential storage, only for primary user
-        if (mIsPrimary) {
+        // Credential storage
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+            mKeyStore = KeyStore.getInstance();
+            Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
+
+            final int storageSummaryRes =
+                mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
+                        : R.string.credential_storage_type_software;
+            credentialStorageType.setSummary(storageSummaryRes);
+
             mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
         } else {
             removePreference(KEY_CREDENTIALS_MANAGER);
         }
 
+        // Application install
+        PreferenceGroup deviceAdminCategory= (PreferenceGroup)
+                root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
         mToggleAppInstallation = (CheckBoxPreference) findPreference(
                 KEY_TOGGLE_INSTALL_APPLICATIONS);
         mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
 
+        // Side loading of apps.
+        mToggleAppInstallation.setEnabled(mIsPrimary);
+
         // Package verification, only visible to primary user and if enabled
         mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
         if (mIsPrimary && showVerifierSetting()) {
@@ -250,8 +276,6 @@
                 mToggleVerifyApps.setEnabled(false);
             }
         } else {
-            PreferenceGroup deviceAdminCategory= (PreferenceGroup)
-                    root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
             if (deviceAdminCategory != null) {
                 deviceAdminCategory.removePreference(mToggleVerifyApps);
             } else {
@@ -259,15 +283,47 @@
             }
         }
 
+        mNotificationAccess = findPreference(KEY_NOTIFICATION_ACCESS);
+        if (mNotificationAccess != null) {
+            final int total = NotificationAccessSettings.getListenersCount(mPM);
+            if (total == 0) {
+                if (deviceAdminCategory != null) {
+                    deviceAdminCategory.removePreference(mNotificationAccess);
+                }
+            } else {
+                final int n = getNumEnabledNotificationListeners();
+                if (n == 0) {
+                    mNotificationAccess.setSummary(getResources().getString(
+                            R.string.manage_notification_access_summary_zero));
+                } else {
+                    mNotificationAccess.setSummary(String.format(getResources().getQuantityString(
+                            R.plurals.manage_notification_access_summary_nonzero,
+                            n, n)));
+                }
+            }
+        }
+
         return root;
     }
 
+    private int getNumEnabledNotificationListeners() {
+        final String flat = Settings.Secure.getString(getContentResolver(),
+                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);
+        if (flat == null || "".equals(flat)) return 0;
+        final String[] components = flat.split(":");
+        return components.length;
+    }
+
     private boolean isNonMarketAppsAllowed() {
         return Settings.Global.getInt(getContentResolver(),
                                       Settings.Global.INSTALL_NON_MARKET_APPS, 0) > 0;
     }
 
     private void setNonMarketAppsAllowed(boolean enabled) {
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)) {
+            return;
+        }
         // Change the system setting
         Settings.Global.putInt(getContentResolver(), Settings.Global.INSTALL_NON_MARKET_APPS,
                                 enabled ? 1 : 0);
@@ -303,6 +359,7 @@
                 .show();
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         if (dialog == mWarnInstallApps && which == DialogInterface.BUTTON_POSITIVE) {
             setNonMarketAppsAllowed(true);
@@ -408,8 +465,7 @@
         }
 
         if (mResetCredentials != null) {
-            KeyStore keyStore = KeyStore.getInstance();
-            mResetCredentials.setEnabled(!keyStore.isUnlocked());
+            mResetCredentials.setEnabled(!mKeyStore.isEmpty());
         }
     }
 
@@ -505,6 +561,7 @@
         createPreferenceHierarchy();
     }
 
+    @Override
     public boolean onPreferenceChange(Preference preference, Object value) {
         if (preference == mLockAfter) {
             int timeout = Integer.parseInt((String) value);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index dc49ba8..02769e1 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -16,25 +16,13 @@
 
 package com.android.settings;
 
-import com.android.internal.util.ArrayUtils;
-import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
-import com.android.settings.accounts.AccountSyncSettings;
-import com.android.settings.accounts.AuthenticatorHelper;
-import com.android.settings.accounts.ManageAccountsSettings;
-import com.android.settings.applications.InstalledAppDetails;
-import com.android.settings.applications.ManageApplications;
-import com.android.settings.bluetooth.BluetoothEnabler;
-import com.android.settings.deviceinfo.Memory;
-import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.vpn2.VpnSettings;
-import com.android.settings.wifi.WifiEnabler;
-
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.OnAccountsUpdateListener;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.RestrictionEntry;
 import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
@@ -62,6 +50,18 @@
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.AccessibilitySettings.ToggleAccessibilityServicePreferenceFragment;
+import com.android.settings.accounts.AccountSyncSettings;
+import com.android.settings.accounts.AuthenticatorHelper;
+import com.android.settings.accounts.ManageAccountsSettings;
+import com.android.settings.bluetooth.BluetoothEnabler;
+import com.android.settings.bluetooth.BluetoothSettings;
+import com.android.settings.wfd.WifiDisplaySettings;
+import com.android.settings.wifi.WifiEnabler;
+import com.android.settings.wifi.WifiSettings;
+import com.android.settings.wifi.p2p.WifiP2pSettings;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -85,7 +85,7 @@
     private static final String META_DATA_KEY_PARENT_FRAGMENT_CLASS =
         "com.android.settings.PARENT_FRAGMENT_CLASS";
 
-    private static final String EXTRA_CLEAR_UI_OPTIONS = "settings:remove_ui_options";
+    private static final String EXTRA_UI_OPTIONS = "settings:ui_options";
 
     private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";
     private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
@@ -136,8 +136,8 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        if (getIntent().getBooleanExtra(EXTRA_CLEAR_UI_OPTIONS, false)) {
-            getWindow().setUiOptions(0);
+        if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
+            getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
         }
 
         mAuthenticatorHelper = new AuthenticatorHelper();
@@ -173,6 +173,7 @@
 
         if (mParentHeader != null) {
             setParentTitle(mParentHeader.title, null, new OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     switchToParent(mParentHeader.fragment);
                 }
@@ -379,26 +380,15 @@
         Intent intent = super.onBuildStartFragmentIntent(fragmentName, args,
                 titleRes, shortTitleRes);
 
-        // some fragments want to avoid split actionbar
-        if (DataUsageSummary.class.getName().equals(fragmentName) ||
-                PowerUsageSummary.class.getName().equals(fragmentName) ||
-                AccountSyncSettings.class.getName().equals(fragmentName) ||
-                UserDictionarySettings.class.getName().equals(fragmentName) ||
-                Memory.class.getName().equals(fragmentName) ||
-                ManageApplications.class.getName().equals(fragmentName) ||
-                WirelessSettings.class.getName().equals(fragmentName) ||
-                SoundSettings.class.getName().equals(fragmentName) ||
-                PrivacySettings.class.getName().equals(fragmentName) ||
-                ManageAccountsSettings.class.getName().equals(fragmentName) ||
-                VpnSettings.class.getName().equals(fragmentName) ||
-                SecuritySettings.class.getName().equals(fragmentName) ||
-                InstalledAppDetails.class.getName().equals(fragmentName) ||
-                ChooseLockGenericFragment.class.getName().equals(fragmentName) ||
-                TetherSettings.class.getName().equals(fragmentName) ||
-                ApnSettings.class.getName().equals(fragmentName) ||
-                LocationSettings.class.getName().equals(fragmentName) ||
-                ZonePicker.class.getName().equals(fragmentName)) {
-            intent.putExtra(EXTRA_CLEAR_UI_OPTIONS, true);
+        // Some fragments want split ActionBar; these should stay in sync with
+        // uiOptions for fragments also defined as activities in manifest.
+        if (WifiSettings.class.getName().equals(fragmentName) ||
+                WifiP2pSettings.class.getName().equals(fragmentName) ||
+                WifiDisplaySettings.class.getName().equals(fragmentName) ||
+                BluetoothSettings.class.getName().equals(fragmentName) ||
+                DreamSettings.class.getName().equals(fragmentName) ||
+                ToggleAccessibilityServicePreferenceFragment.class.getName().equals(fragmentName)) {
+            intent.putExtra(EXTRA_UI_OPTIONS, ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);
         }
 
         intent.setClass(this, SubSettings.class);
@@ -411,7 +401,6 @@
     @Override
     public void onBuildHeaders(List<Header> headers) {
         loadHeadersFromResource(R.xml.settings_headers, headers);
-
         updateHeaderList(headers);
     }
 
@@ -421,6 +410,7 @@
                 android.os.Build.TYPE.equals("eng"));
         int i = 0;
 
+        final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
         mHeaderIndexMap.clear();
         while (i < target.size()) {
             Header header = target.get(i);
@@ -462,6 +452,10 @@
                 if (!showDev) {
                     target.remove(i);
                 }
+            } else if (id == R.id.account_add) {
+                if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+                    target.remove(i);
+                }
             }
 
             if (i < target.size() && target.get(i) == header
@@ -769,13 +763,18 @@
             titleRes = R.string.wallpaper_settings_fragment_title;
         } else if (pref.getFragment().equals(OwnerInfoSettings.class.getName())
                 && UserHandle.myUserId() != UserHandle.USER_OWNER) {
-            titleRes = R.string.user_info_settings_title;
+            if (UserManager.get(this).isLinkedUser()) {
+                titleRes = R.string.profile_info_settings_title;
+            } else {
+                titleRes = R.string.user_info_settings_title;
+            }
         }
         startPreferencePanel(pref.getFragment(), pref.getExtras(), titleRes, pref.getTitle(),
                 null, 0);
         return true;
     }
 
+    @Override
     public boolean shouldUpRecreateTask(Intent targetIntent) {
         return super.shouldUpRecreateTask(new Intent(this, Settings.class));
     }
@@ -819,6 +818,7 @@
     public static class DeviceInfoSettingsActivity extends Settings { /* empty */ }
     public static class ApplicationSettingsActivity extends Settings { /* empty */ }
     public static class ManageApplicationsActivity extends Settings { /* empty */ }
+    public static class AppOpsSummaryActivity extends Settings { /* empty */ }
     public static class StorageUseActivity extends Settings { /* empty */ }
     public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
     public static class AccessibilitySettingsActivity extends Settings { /* empty */ }
@@ -838,4 +838,7 @@
     public static class AndroidBeamSettingsActivity extends Settings { /* empty */ }
     public static class WifiDisplaySettingsActivity extends Settings { /* empty */ }
     public static class DreamSettingsActivity extends Settings { /* empty */ }
+    public static class NotificationStationActivity extends Settings { /* empty */ }
+    public static class UserSettingsActivity extends Settings { /* empty */ }
+    public static class NotificationAccessSettingsActivity extends Settings { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index b418826..60765a9 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -20,6 +20,7 @@
 import android.app.DialogFragment;
 import android.app.Fragment;
 import android.content.ContentResolver;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -48,6 +49,9 @@
 
     private String mHelpUrl;
 
+    // Cache the content resolver for async callbacks
+    private ContentResolver mContentResolver;
+
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
@@ -104,7 +108,11 @@
      * Returns the ContentResolver from the owning Activity.
      */
     protected ContentResolver getContentResolver() {
-        return getActivity().getContentResolver();
+        Context context = getActivity();
+        if (context != null) {
+            mContentResolver = context.getContentResolver();
+        }
+        return mContentResolver;
     }
 
     /**
@@ -233,8 +241,11 @@
                     mParentFragment = getFragmentManager().findFragmentById(mParentFragmentId);
                     if (!(mParentFragment instanceof DialogCreatable)) {
                         throw new IllegalArgumentException(
-                                KEY_PARENT_FRAGMENT_ID + " must implement "
-                                        + DialogCreatable.class.getName());
+                                (mParentFragment != null 
+                                        ? mParentFragment.getClass().getName()
+                                        : mParentFragmentId)
+                                + " must implement "
+                                + DialogCreatable.class.getName());
                     }
                 }
                 // This dialog fragment could be created from non-SettingsPreferenceFragment
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 931858c..28d93f1 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -145,6 +145,11 @@
             findPreference(KEY_RING_VOLUME).setDependency(null);
         }
 
+        if (getResources().getBoolean(com.android.internal.R.bool.config_useFixedVolume)) {
+            // device with fixed volume policy, do not display volumes submenu
+            getPreferenceScreen().removePreference(findPreference(KEY_RING_VOLUME));
+        }
+
         mVibrateWhenRinging = (CheckBoxPreference) findPreference(KEY_VIBRATE);
         mVibrateWhenRinging.setPersistent(false);
         mVibrateWhenRinging.setChecked(Settings.System.getInt(resolver,
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 8829825..f031f0a 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -449,7 +449,7 @@
                     com.android.internal.R.dimen.preference_fragment_padding_bottom);
 
             final int effectivePaddingSide = ignoreSidePadding ? 0 : paddingSide;
-            list.setPadding(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
+            list.setPaddingRelative(effectivePaddingSide, 0, effectivePaddingSide, paddingBottom);
         }
     }
 
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index c346017..64c4d4a 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -28,17 +28,16 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.content.SyncAdapterType;
 import android.content.SyncInfo;
 import android.content.SyncStatusInfo;
 import android.content.pm.ProviderInfo;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
 import android.text.TextUtils;
-import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -93,10 +92,12 @@
                 .setNegativeButton(android.R.string.cancel, null)
                 .setPositiveButton(R.string.remove_account_label,
                         new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                         AccountManager.get(AccountSyncSettings.this.getActivity())
                                 .removeAccount(mAccount,
                                 new AccountManagerCallback<Boolean>() {
+                            @Override
                             public void run(AccountManagerFuture<Boolean> future) {
                                 // If already out of this screen, don't proceed.
                                 if (!AccountSyncSettings.this.isResumed()) {
@@ -233,12 +234,15 @@
         MenuItem syncCancel = menu.add(0, MENU_SYNC_CANCEL_ID, 0,
                 getString(R.string.sync_menu_sync_cancel))
                 .setIcon(com.android.internal.R.drawable.ic_menu_close_clear_cancel);
-        MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
-                getString(R.string.remove_account_label))
-                .setIcon(R.drawable.ic_menu_delete_holo_dark);
 
-        removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
-                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (!um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+            MenuItem removeAccount = menu.add(0, MENU_REMOVE_ACCOUNT_ID, 0,
+                    getString(R.string.remove_account_label))
+                    .setIcon(R.drawable.ic_menu_delete_holo_dark);
+            removeAccount.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
+                    MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        }
         syncNow.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
                 MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         syncCancel.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER |
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index 6f7e29a..39906eb 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -23,10 +23,14 @@
 import android.accounts.OperationCanceledException;
 import android.app.Activity;
 import android.app.PendingIntent;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.util.Log;
+import android.widget.Toast;
 
+import com.android.settings.R;
 import com.android.settings.Utils;
 
 import java.io.IOException;
@@ -71,7 +75,8 @@
 
     private PendingIntent mPendingIntent;
 
-    private AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
+    private final AccountManagerCallback<Bundle> mCallback = new AccountManagerCallback<Bundle>() {
+        @Override
         public void run(AccountManagerFuture<Bundle> future) {
             boolean done = true;
             try {
@@ -120,6 +125,14 @@
             if (Log.isLoggable(TAG, Log.VERBOSE)) Log.v(TAG, "restored");
         }
 
+        final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+            // We aren't allowed to add an account.
+            Toast.makeText(this, R.string.user_cannot_add_accounts_message, Toast.LENGTH_LONG)
+                    .show();
+            finish();
+            return;
+        }
         if (mAddAccountCalled) {
             // We already called add account - maybe the callback was lost.
             finish();
@@ -162,6 +175,7 @@
         }
     }
 
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(KEY_ADD_CALLED, mAddAccountCalled);
diff --git a/src/com/android/settings/accounts/ManageAccountsSettings.java b/src/com/android/settings/accounts/ManageAccountsSettings.java
index 46aa566..8a093ca 100644
--- a/src/com/android/settings/accounts/ManageAccountsSettings.java
+++ b/src/com/android/settings/accounts/ManageAccountsSettings.java
@@ -332,6 +332,7 @@
                 getPreferenceScreen().addPreference(preference);
                 if (mFirstAccount == null) {
                     mFirstAccount = account;
+                    getActivity().invalidateOptionsMenu();
                 }
             }
         }
diff --git a/src/com/android/settings/applications/AppOpsCategory.java b/src/com/android/settings/applications/AppOpsCategory.java
new file mode 100644
index 0000000..125a43b
--- /dev/null
+++ b/src/com/android/settings/applications/AppOpsCategory.java
@@ -0,0 +1,374 @@
+/**
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.ListFragment;
+import android.app.LoaderManager;
+import android.content.AsyncTaskLoader;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.Loader;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.TextView;
+
+import java.util.List;
+
+import com.android.settings.R;
+import com.android.settings.applications.AppOpsState.AppOpEntry;
+
+public class AppOpsCategory extends ListFragment implements
+        LoaderManager.LoaderCallbacks<List<AppOpEntry>> {
+
+    private static final int RESULT_APP_DETAILS = 1;
+
+    AppOpsState mState;
+
+    // This is the Adapter being used to display the list's data.
+    AppListAdapter mAdapter;
+
+    String mCurrentPkgName;
+
+    public AppOpsCategory() {
+    }
+
+    public AppOpsCategory(AppOpsState.OpsTemplate template) {
+        Bundle args = new Bundle();
+        args.putParcelable("template", template);
+        setArguments(args);
+    }
+
+    /**
+     * Helper for determining if the configuration has changed in an interesting
+     * way so we need to rebuild the app list.
+     */
+    public static class InterestingConfigChanges {
+        final Configuration mLastConfiguration = new Configuration();
+        int mLastDensity;
+
+        boolean applyNewConfig(Resources res) {
+            int configChanges = mLastConfiguration.updateFrom(res.getConfiguration());
+            boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi;
+            if (densityChanged || (configChanges&(ActivityInfo.CONFIG_LOCALE
+                    |ActivityInfo.CONFIG_UI_MODE|ActivityInfo.CONFIG_SCREEN_LAYOUT)) != 0) {
+                mLastDensity = res.getDisplayMetrics().densityDpi;
+                return true;
+            }
+            return false;
+        }
+    }
+
+    /**
+     * Helper class to look for interesting changes to the installed apps
+     * so that the loader can be updated.
+     */
+    public static class PackageIntentReceiver extends BroadcastReceiver {
+        final AppListLoader mLoader;
+
+        public PackageIntentReceiver(AppListLoader loader) {
+            mLoader = loader;
+            IntentFilter filter = new IntentFilter(Intent.ACTION_PACKAGE_ADDED);
+            filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+            filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+            filter.addDataScheme("package");
+            mLoader.getContext().registerReceiver(this, filter);
+            // Register for events related to sdcard installation.
+            IntentFilter sdFilter = new IntentFilter();
+            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_AVAILABLE);
+            sdFilter.addAction(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE);
+            mLoader.getContext().registerReceiver(this, sdFilter);
+        }
+
+        @Override public void onReceive(Context context, Intent intent) {
+            // Tell the loader about the change.
+            mLoader.onContentChanged();
+        }
+    }
+
+    /**
+     * A custom Loader that loads all of the installed applications.
+     */
+    public static class AppListLoader extends AsyncTaskLoader<List<AppOpEntry>> {
+        final InterestingConfigChanges mLastConfig = new InterestingConfigChanges();
+        final AppOpsState mState;
+        final AppOpsState.OpsTemplate mTemplate;
+
+        List<AppOpEntry> mApps;
+        PackageIntentReceiver mPackageObserver;
+
+        public AppListLoader(Context context, AppOpsState state, AppOpsState.OpsTemplate template) {
+            super(context);
+            mState = state;
+            mTemplate = template;
+        }
+
+        @Override public List<AppOpEntry> loadInBackground() {
+            return mState.buildState(mTemplate);
+        }
+
+        /**
+         * Called when there is new data to deliver to the client.  The
+         * super class will take care of delivering it; the implementation
+         * here just adds a little more logic.
+         */
+        @Override public void deliverResult(List<AppOpEntry> apps) {
+            if (isReset()) {
+                // An async query came in while the loader is stopped.  We
+                // don't need the result.
+                if (apps != null) {
+                    onReleaseResources(apps);
+                }
+            }
+            List<AppOpEntry> oldApps = apps;
+            mApps = apps;
+
+            if (isStarted()) {
+                // If the Loader is currently started, we can immediately
+                // deliver its results.
+                super.deliverResult(apps);
+            }
+
+            // At this point we can release the resources associated with
+            // 'oldApps' if needed; now that the new result is delivered we
+            // know that it is no longer in use.
+            if (oldApps != null) {
+                onReleaseResources(oldApps);
+            }
+        }
+
+        /**
+         * Handles a request to start the Loader.
+         */
+        @Override protected void onStartLoading() {
+            // We don't monitor changed when loading is stopped, so need
+            // to always reload at this point.
+            onContentChanged();
+
+            if (mApps != null) {
+                // If we currently have a result available, deliver it
+                // immediately.
+                deliverResult(mApps);
+            }
+
+            // Start watching for changes in the app data.
+            if (mPackageObserver == null) {
+                mPackageObserver = new PackageIntentReceiver(this);
+            }
+
+            // Has something interesting in the configuration changed since we
+            // last built the app list?
+            boolean configChange = mLastConfig.applyNewConfig(getContext().getResources());
+
+            if (takeContentChanged() || mApps == null || configChange) {
+                // If the data has changed since the last time it was loaded
+                // or is not currently available, start a load.
+                forceLoad();
+            }
+        }
+
+        /**
+         * Handles a request to stop the Loader.
+         */
+        @Override protected void onStopLoading() {
+            // Attempt to cancel the current load task if possible.
+            cancelLoad();
+        }
+
+        /**
+         * Handles a request to cancel a load.
+         */
+        @Override public void onCanceled(List<AppOpEntry> apps) {
+            super.onCanceled(apps);
+
+            // At this point we can release the resources associated with 'apps'
+            // if needed.
+            onReleaseResources(apps);
+        }
+
+        /**
+         * Handles a request to completely reset the Loader.
+         */
+        @Override protected void onReset() {
+            super.onReset();
+
+            // Ensure the loader is stopped
+            onStopLoading();
+
+            // At this point we can release the resources associated with 'apps'
+            // if needed.
+            if (mApps != null) {
+                onReleaseResources(mApps);
+                mApps = null;
+            }
+
+            // Stop monitoring for changes.
+            if (mPackageObserver != null) {
+                getContext().unregisterReceiver(mPackageObserver);
+                mPackageObserver = null;
+            }
+        }
+
+        /**
+         * Helper function to take care of releasing resources associated
+         * with an actively loaded data set.
+         */
+        protected void onReleaseResources(List<AppOpEntry> apps) {
+            // For a simple List<> there is nothing to do.  For something
+            // like a Cursor, we would close it here.
+        }
+    }
+
+    public static class AppListAdapter extends BaseAdapter {
+        private final Resources mResources;
+        private final LayoutInflater mInflater;
+        private final AppOpsState mState;
+
+        List<AppOpEntry> mList;
+
+        public AppListAdapter(Context context, AppOpsState state) {
+            mResources = context.getResources();
+            mInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            mState = state;
+        }
+
+        public void setData(List<AppOpEntry> data) {
+            mList = data;
+            notifyDataSetChanged();
+        }
+
+        @Override
+        public int getCount() {
+            return mList != null ? mList.size() : 0;
+        }
+
+        @Override
+        public AppOpEntry getItem(int position) {
+            return mList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        /**
+         * Populate new items in the list.
+         */
+        @Override public View getView(int position, View convertView, ViewGroup parent) {
+            View view;
+
+            if (convertView == null) {
+                view = mInflater.inflate(R.layout.app_ops_item, parent, false);
+            } else {
+                view = convertView;
+            }
+
+            AppOpEntry item = getItem(position);
+            ((ImageView)view.findViewById(R.id.app_icon)).setImageDrawable(
+                    item.getAppEntry().getIcon());
+            ((TextView)view.findViewById(R.id.app_name)).setText(item.getAppEntry().getLabel());
+            ((TextView)view.findViewById(R.id.op_name)).setText(item.getSummaryText(mState));
+            ((TextView)view.findViewById(R.id.op_time)).setText(
+                    item.getTimeText(mResources, false));
+
+            return view;
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mState = new AppOpsState(getActivity());
+    }
+
+    @Override public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        // Give some text to display if there is no data.  In a real
+        // application this would come from a resource.
+        setEmptyText("No applications");
+
+        // We have a menu item to show in action bar.
+        setHasOptionsMenu(true);
+
+        // Create an empty adapter we will use to display the loaded data.
+        mAdapter = new AppListAdapter(getActivity(), mState);
+        setListAdapter(mAdapter);
+
+        // Start out with a progress indicator.
+        setListShown(false);
+
+        // Prepare the loader.
+        getLoaderManager().initLoader(0, null, this);
+    }
+
+    // utility method used to start sub activity
+    private void startApplicationDetailsActivity() {
+        // start new fragment to display extended information
+        Bundle args = new Bundle();
+        args.putString(AppOpsDetails.ARG_PACKAGE_NAME, mCurrentPkgName);
+
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        pa.startPreferencePanel(AppOpsDetails.class.getName(), args,
+                R.string.app_ops_settings, null, this, RESULT_APP_DETAILS);
+    }
+    
+    @Override public void onListItemClick(ListView l, View v, int position, long id) {
+        AppOpEntry entry = mAdapter.getItem(position);
+        if (entry != null) {
+            mCurrentPkgName = entry.getAppEntry().getApplicationInfo().packageName;
+            startApplicationDetailsActivity();
+        }
+    }
+
+    @Override public Loader<List<AppOpEntry>> onCreateLoader(int id, Bundle args) {
+        Bundle fargs = getArguments();
+        AppOpsState.OpsTemplate template = null;
+        if (fargs != null) {
+            template = (AppOpsState.OpsTemplate)fargs.getParcelable("template");
+        }
+        return new AppListLoader(getActivity(), mState, template);
+    }
+
+    @Override public void onLoadFinished(Loader<List<AppOpEntry>> loader, List<AppOpEntry> data) {
+        // Set the new data in the adapter.
+        mAdapter.setData(data);
+
+        // The list should now be shown.
+        if (isResumed()) {
+            setListShown(true);
+        } else {
+            setListShownNoAnimation(true);
+        }
+    }
+
+    @Override public void onLoaderReset(Loader<List<AppOpEntry>> loader) {
+        // Clear the data in the adapter.
+        mAdapter.setData(null);
+    }
+}
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
new file mode 100644
index 0000000..1e2ac7d
--- /dev/null
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -0,0 +1,201 @@
+/**
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.Activity;
+import android.app.AppOpsManager;
+import android.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.PermissionGroupInfo;
+import android.content.pm.PermissionInfo;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceActivity;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+
+import java.util.List;
+
+public class AppOpsDetails extends Fragment {
+    static final String TAG = "AppOpsDetails";
+
+    public static final String ARG_PACKAGE_NAME = "package";
+
+    private AppOpsState mState;
+    private PackageManager mPm;
+    private AppOpsManager mAppOps;
+    private PackageInfo mPackageInfo;
+    private LayoutInflater mInflater;
+    private View mRootView;
+    private TextView mAppVersion;
+    private LinearLayout mOperationsSection;
+
+    // Utility method to set application label and icon.
+    private void setAppLabelAndIcon(PackageInfo pkgInfo) {
+        final View appSnippet = mRootView.findViewById(R.id.app_snippet);
+        appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
+
+        ImageView icon = (ImageView) appSnippet.findViewById(R.id.app_icon);
+        icon.setImageDrawable(mPm.getApplicationIcon(pkgInfo.applicationInfo));
+        // Set application name.
+        TextView label = (TextView) appSnippet.findViewById(R.id.app_name);
+        label.setText(mPm.getApplicationLabel(pkgInfo.applicationInfo));
+        // Version number of application
+        mAppVersion = (TextView) appSnippet.findViewById(R.id.app_size);
+
+        if (pkgInfo.versionName != null) {
+            mAppVersion.setVisibility(View.VISIBLE);
+            mAppVersion.setText(getActivity().getString(R.string.version_text,
+                    String.valueOf(pkgInfo.versionName)));
+        } else {
+            mAppVersion.setVisibility(View.INVISIBLE);
+        }
+    }
+
+    private String retrieveAppEntry() {
+        final Bundle args = getArguments();
+        String packageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
+        if (packageName == null) {
+            Intent intent = (args == null) ?
+                    getActivity().getIntent() : (Intent) args.getParcelable("intent");
+            if (intent != null) {
+                packageName = intent.getData().getSchemeSpecificPart();
+            }
+        }
+        try {
+            mPackageInfo = mPm.getPackageInfo(packageName,
+                    PackageManager.GET_DISABLED_COMPONENTS |
+                    PackageManager.GET_UNINSTALLED_PACKAGES);
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "Exception when retrieving package:" + packageName, e);
+            mPackageInfo = null;
+        }
+
+        return packageName;
+    }
+
+    private boolean refreshUi() {
+        if (mPackageInfo == null) {
+            return false;
+        }
+
+        setAppLabelAndIcon(mPackageInfo);
+
+        Resources res = getActivity().getResources();
+
+        mOperationsSection.removeAllViews();
+        String lastPermGroup = "";
+        for (AppOpsState.OpsTemplate tpl : AppOpsState.ALL_TEMPLATES) {
+            List<AppOpsState.AppOpEntry> entries = mState.buildState(tpl,
+                    mPackageInfo.applicationInfo.uid, mPackageInfo.packageName);
+            for (final AppOpsState.AppOpEntry entry : entries) {
+                final AppOpsManager.OpEntry firstOp = entry.getOpEntry(0);
+                final View view = mInflater.inflate(R.layout.app_ops_details_item,
+                        mOperationsSection, false);
+                mOperationsSection.addView(view);
+                String perm = AppOpsManager.opToPermission(firstOp.getOp());
+                if (perm != null) {
+                    try {
+                        PermissionInfo pi = mPm.getPermissionInfo(perm, 0);
+                        if (pi.group != null && !lastPermGroup.equals(pi.group)) {
+                            lastPermGroup = pi.group;
+                            PermissionGroupInfo pgi = mPm.getPermissionGroupInfo(pi.group, 0);
+                            if (pgi.icon != 0) {
+                                ((ImageView)view.findViewById(R.id.op_icon)).setImageDrawable(
+                                        pgi.loadIcon(mPm));
+                            }
+                        }
+                    } catch (NameNotFoundException e) {
+                    }
+                }
+                ((TextView)view.findViewById(R.id.op_name)).setText(
+                        entry.getSwitchText(mState));
+                ((TextView)view.findViewById(R.id.op_time)).setText(
+                        entry.getTimeText(res, true));
+                Switch sw = (Switch)view.findViewById(R.id.switchWidget);
+                final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());
+                sw.setChecked(mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),
+                        entry.getPackageOps().getPackageName()) == AppOpsManager.MODE_ALLOWED);
+                sw.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        mAppOps.setMode(switchOp, entry.getPackageOps().getUid(),
+                                entry.getPackageOps().getPackageName(), isChecked
+                                ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_IGNORED);
+                    }
+                });
+            }
+        }
+
+        return true;
+    }
+
+    private void setIntentAndFinish(boolean finish, boolean appChanged) {
+        Intent intent = new Intent();
+        intent.putExtra(ManageApplications.APP_CHG, appChanged);
+        PreferenceActivity pa = (PreferenceActivity)getActivity();
+        pa.finishPreferencePanel(this, Activity.RESULT_OK, intent);
+    }
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        mState = new AppOpsState(getActivity());
+        mPm = getActivity().getPackageManager();
+        mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        mAppOps = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);
+
+        retrieveAppEntry();
+
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(
+            LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        final View view = inflater.inflate(R.layout.app_ops_details, container, false);
+        Utils.prepareCustomPreferencesList(container, view, view, false);
+
+        mRootView = view;
+        mOperationsSection = (LinearLayout)view.findViewById(R.id.operations_section);
+        return view;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (!refreshUi()) {
+            setIntentAndFinish(true, true);
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
new file mode 100644
index 0000000..6cdbdaf
--- /dev/null
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -0,0 +1,564 @@
+/**
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.format.DateUtils;
+
+import android.util.Log;
+import android.util.SparseArray;
+import com.android.settings.R;
+
+import java.io.File;
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+
+public class AppOpsState {
+    static final String TAG = "AppOpsState";
+    static final boolean DEBUG = false;
+
+    final Context mContext;
+    final AppOpsManager mAppOps;
+    final PackageManager mPm;
+    final CharSequence[] mOpSummaries;
+    final CharSequence[] mOpLabels;
+
+    List<AppOpEntry> mApps;
+
+    public AppOpsState(Context context) {
+        mContext = context;
+        mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);
+        mPm = context.getPackageManager();
+        mOpSummaries = context.getResources().getTextArray(R.array.app_ops_summaries);
+        mOpLabels = context.getResources().getTextArray(R.array.app_ops_labels);
+    }
+
+    public static class OpsTemplate implements Parcelable {
+        public final int[] ops;
+        public final boolean[] showPerms;
+
+        public OpsTemplate(int[] _ops, boolean[] _showPerms) {
+            ops = _ops;
+            showPerms = _showPerms;
+        }
+
+        OpsTemplate(Parcel src) {
+            ops = src.createIntArray();
+            showPerms = src.createBooleanArray();
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeIntArray(ops);
+            dest.writeBooleanArray(showPerms);
+        }
+
+        public static final Creator<OpsTemplate> CREATOR = new Creator<OpsTemplate>() {
+            @Override public OpsTemplate createFromParcel(Parcel source) {
+                return new OpsTemplate(source);
+            }
+
+            @Override public OpsTemplate[] newArray(int size) {
+                return new OpsTemplate[size];
+            }
+        };
+    }
+
+    public static final OpsTemplate LOCATION_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_COARSE_LOCATION,
+                    AppOpsManager.OP_FINE_LOCATION,
+                    AppOpsManager.OP_GPS,
+                    AppOpsManager.OP_WIFI_SCAN,
+                    AppOpsManager.OP_NEIGHBORING_CELLS },
+            new boolean[] { true,
+                    true,
+                    false,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate PERSONAL_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_CONTACTS,
+                    AppOpsManager.OP_WRITE_CONTACTS,
+                    AppOpsManager.OP_READ_CALL_LOG,
+                    AppOpsManager.OP_WRITE_CALL_LOG,
+                    AppOpsManager.OP_READ_CALENDAR,
+                    AppOpsManager.OP_WRITE_CALENDAR,
+                    AppOpsManager.OP_READ_CLIPBOARD,
+                    AppOpsManager.OP_WRITE_CLIPBOARD },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    false,
+                    false }
+            );
+
+    public static final OpsTemplate MESSAGING_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_READ_SMS,
+                    AppOpsManager.OP_RECEIVE_SMS,
+                    AppOpsManager.OP_RECEIVE_EMERGECY_SMS,
+                    AppOpsManager.OP_RECEIVE_MMS,
+                    AppOpsManager.OP_RECEIVE_WAP_PUSH,
+                    AppOpsManager.OP_WRITE_SMS,
+                    AppOpsManager.OP_SEND_SMS,
+                    AppOpsManager.OP_READ_ICC_SMS,
+                    AppOpsManager.OP_WRITE_ICC_SMS },
+            new boolean[] { true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true }
+            );
+
+    public static final OpsTemplate DEVICE_TEMPLATE = new OpsTemplate(
+            new int[] { AppOpsManager.OP_VIBRATE,
+                    AppOpsManager.OP_POST_NOTIFICATION,
+                    AppOpsManager.OP_ACCESS_NOTIFICATIONS,
+                    AppOpsManager.OP_CALL_PHONE,
+                    AppOpsManager.OP_WRITE_SETTINGS,
+                    AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
+                    AppOpsManager.OP_CAMERA,
+                    AppOpsManager.OP_RECORD_AUDIO,
+                    AppOpsManager.OP_PLAY_AUDIO },
+            new boolean[] { false,
+                    false,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true,
+                    true }
+            );
+
+    public static final OpsTemplate[] ALL_TEMPLATES = new OpsTemplate[] {
+            LOCATION_TEMPLATE, PERSONAL_TEMPLATE, MESSAGING_TEMPLATE, DEVICE_TEMPLATE
+    };
+
+    /**
+     * This class holds the per-item data in our Loader.
+     */
+    public static class AppEntry {
+        private final AppOpsState mState;
+        private final ApplicationInfo mInfo;
+        private final File mApkFile;
+        private final SparseArray<AppOpsManager.OpEntry> mOps
+                = new SparseArray<AppOpsManager.OpEntry>();
+        private final SparseArray<AppOpEntry> mOpSwitches
+                = new SparseArray<AppOpEntry>();
+        private String mLabel;
+        private Drawable mIcon;
+        private boolean mMounted;
+
+        public AppEntry(AppOpsState state, ApplicationInfo info) {
+            mState = state;
+            mInfo = info;
+            mApkFile = new File(info.sourceDir);
+        }
+
+        public void addOp(AppOpEntry entry, AppOpsManager.OpEntry op) {
+            mOps.put(op.getOp(), op);
+            mOpSwitches.put(AppOpsManager.opToSwitch(op.getOp()), entry);
+        }
+
+        public boolean hasOp(int op) {
+            return mOps.indexOfKey(op) >= 0;
+        }
+
+        public AppOpEntry getOpSwitch(int op) {
+            return mOpSwitches.get(AppOpsManager.opToSwitch(op));
+        }
+
+        public ApplicationInfo getApplicationInfo() {
+            return mInfo;
+        }
+
+        public String getLabel() {
+            return mLabel;
+        }
+
+        public Drawable getIcon() {
+            if (mIcon == null) {
+                if (mApkFile.exists()) {
+                    mIcon = mInfo.loadIcon(mState.mPm);
+                    return mIcon;
+                } else {
+                    mMounted = false;
+                }
+            } else if (!mMounted) {
+                // If the app wasn't mounted but is now mounted, reload
+                // its icon.
+                if (mApkFile.exists()) {
+                    mMounted = true;
+                    mIcon = mInfo.loadIcon(mState.mPm);
+                    return mIcon;
+                }
+            } else {
+                return mIcon;
+            }
+
+            return mState.mContext.getResources().getDrawable(
+                    android.R.drawable.sym_def_app_icon);
+        }
+
+        @Override public String toString() {
+            return mLabel;
+        }
+
+        void loadLabel(Context context) {
+            if (mLabel == null || !mMounted) {
+                if (!mApkFile.exists()) {
+                    mMounted = false;
+                    mLabel = mInfo.packageName;
+                } else {
+                    mMounted = true;
+                    CharSequence label = mInfo.loadLabel(context.getPackageManager());
+                    mLabel = label != null ? label.toString() : mInfo.packageName;
+                }
+            }
+        }
+    }
+
+    /**
+     * This class holds the per-item data in our Loader.
+     */
+    public static class AppOpEntry {
+        private final AppOpsManager.PackageOps mPkgOps;
+        private final ArrayList<AppOpsManager.OpEntry> mOps
+                = new ArrayList<AppOpsManager.OpEntry>();
+        private final ArrayList<AppOpsManager.OpEntry> mSwitchOps
+                = new ArrayList<AppOpsManager.OpEntry>();
+        private final AppEntry mApp;
+        private final int mSwitchOrder;
+
+        public AppOpEntry(AppOpsManager.PackageOps pkg, AppOpsManager.OpEntry op, AppEntry app,
+                int switchOrder) {
+            mPkgOps = pkg;
+            mApp = app;
+            mSwitchOrder = switchOrder;
+            mApp.addOp(this, op);
+            mOps.add(op);
+            mSwitchOps.add(op);
+        }
+
+        private static void addOp(ArrayList<AppOpsManager.OpEntry> list, AppOpsManager.OpEntry op) {
+            for (int i=0; i<list.size(); i++) {
+                AppOpsManager.OpEntry pos = list.get(i);
+                if (pos.isRunning() != op.isRunning()) {
+                    if (op.isRunning()) {
+                        list.add(i, op);
+                        return;
+                    }
+                    continue;
+                }
+                if (pos.getTime() < op.getTime()) {
+                    list.add(i, op);
+                    return;
+                }
+            }
+            list.add(op);
+        }
+
+        public void addOp(AppOpsManager.OpEntry op) {
+            mApp.addOp(this, op);
+            addOp(mOps, op);
+            if (mApp.getOpSwitch(AppOpsManager.opToSwitch(op.getOp())) == null) {
+                addOp(mSwitchOps, op);
+            }
+        }
+
+        public AppEntry getAppEntry() {
+            return mApp;
+        }
+
+        public int getSwitchOrder() {
+            return mSwitchOrder;
+        }
+
+        public AppOpsManager.PackageOps getPackageOps() {
+            return mPkgOps;
+        }
+
+        public int getNumOpEntry() {
+            return mOps.size();
+        }
+
+        public AppOpsManager.OpEntry getOpEntry(int pos) {
+            return mOps.get(pos);
+        }
+
+        private CharSequence getCombinedText(ArrayList<AppOpsManager.OpEntry> ops,
+                CharSequence[] items) {
+            if (ops.size() == 1) {
+                return items[ops.get(0).getOp()];
+            } else {
+                StringBuilder builder = new StringBuilder();
+                for (int i=0; i<ops.size(); i++) {
+                    if (i > 0) {
+                        builder.append(", ");
+                    }
+                    builder.append(items[ops.get(i).getOp()]);
+                }
+                return builder.toString();
+            }
+        }
+
+        public CharSequence getSummaryText(AppOpsState state) {
+            return getCombinedText(mOps, state.mOpSummaries);
+        }
+
+        public CharSequence getSwitchText(AppOpsState state) {
+            if (mSwitchOps.size() > 0) {
+                return getCombinedText(mSwitchOps, state.mOpLabels);
+            } else {
+                return getCombinedText(mOps, state.mOpLabels);
+            }
+        }
+
+        public CharSequence getTimeText(Resources res, boolean showEmptyText) {
+            if (isRunning()) {
+                return res.getText(R.string.app_ops_running);
+            }
+            if (getTime() > 0) {
+                return DateUtils.getRelativeTimeSpanString(getTime(),
+                        System.currentTimeMillis(),
+                        DateUtils.MINUTE_IN_MILLIS,
+                        DateUtils.FORMAT_ABBREV_RELATIVE);
+            }
+            return showEmptyText ? res.getText(R.string.app_ops_never_used) : "";
+        }
+
+        public boolean isRunning() {
+            return mOps.get(0).isRunning();
+        }
+
+        public long getTime() {
+            return mOps.get(0).getTime();
+        }
+
+        @Override public String toString() {
+            return mApp.getLabel();
+        }
+    }
+
+    /**
+     * Perform alphabetical comparison of application entry objects.
+     */
+    public static final Comparator<AppOpEntry> APP_OP_COMPARATOR = new Comparator<AppOpEntry>() {
+        private final Collator sCollator = Collator.getInstance();
+        @Override
+        public int compare(AppOpEntry object1, AppOpEntry object2) {
+            if (object1.getSwitchOrder() != object2.getSwitchOrder()) {
+                return object1.getSwitchOrder() < object2.getSwitchOrder() ? -1 : 1;
+            }
+            if (object1.isRunning() != object2.isRunning()) {
+                // Currently running ops go first.
+                return object1.isRunning() ? -1 : 1;
+            }
+            if (object1.getTime() != object2.getTime()) {
+                // More recent times go first.
+                return object1.getTime() > object2.getTime() ? -1 : 1;
+            }
+            return sCollator.compare(object1.getAppEntry().getLabel(),
+                    object2.getAppEntry().getLabel());
+        }
+    };
+
+    private void addOp(List<AppOpEntry> entries, AppOpsManager.PackageOps pkgOps,
+            AppEntry appEntry, AppOpsManager.OpEntry opEntry, boolean allowMerge, int switchOrder) {
+        if (allowMerge && entries.size() > 0) {
+            AppOpEntry last = entries.get(entries.size()-1);
+            if (last.getAppEntry() == appEntry) {
+                boolean lastExe = last.getTime() != 0;
+                boolean entryExe = opEntry.getTime() != 0;
+                if (lastExe == entryExe) {
+                    if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
+                            + pkgOps.getPackageName() + ": append to " + last);
+                    last.addOp(opEntry);
+                    return;
+                }
+            }
+        }
+        AppOpEntry entry = appEntry.getOpSwitch(opEntry.getOp());
+        if (entry != null) {
+            entry.addOp(opEntry);
+            return;
+        }
+        entry = new AppOpEntry(pkgOps, opEntry, appEntry, switchOrder);
+        if (DEBUG) Log.d(TAG, "Add op " + opEntry.getOp() + " to package "
+                + pkgOps.getPackageName() + ": making new " + entry);
+        entries.add(entry);
+    }
+
+    public List<AppOpEntry> buildState(OpsTemplate tpl) {
+        return buildState(tpl, 0, null);
+    }
+
+    private AppEntry getAppEntry(final Context context, final HashMap<String, AppEntry> appEntries,
+            final String packageName, ApplicationInfo appInfo) {
+        AppEntry appEntry = appEntries.get(packageName);
+        if (appEntry == null) {
+            if (appInfo == null) {
+                try {
+                    appInfo = mPm.getApplicationInfo(packageName,
+                            PackageManager.GET_DISABLED_COMPONENTS
+                            | PackageManager.GET_UNINSTALLED_PACKAGES);
+                } catch (PackageManager.NameNotFoundException e) {
+                    Log.w(TAG, "Unable to find info for package " + packageName);
+                    return null;
+                }
+            }
+            appEntry = new AppEntry(this, appInfo);
+            appEntry.loadLabel(context);
+            appEntries.put(packageName, appEntry);
+        }
+        return appEntry;
+    }
+
+    public List<AppOpEntry> buildState(OpsTemplate tpl, int uid, String packageName) {
+        final Context context = mContext;
+
+        final HashMap<String, AppEntry> appEntries = new HashMap<String, AppEntry>();
+        final List<AppOpEntry> entries = new ArrayList<AppOpEntry>();
+
+        final ArrayList<String> perms = new ArrayList<String>();
+        final ArrayList<Integer> permOps = new ArrayList<Integer>();
+        final int[] opToOrder = new int[AppOpsManager._NUM_OP];
+        for (int i=0; i<tpl.ops.length; i++) {
+            if (tpl.showPerms[i]) {
+                String perm = AppOpsManager.opToPermission(tpl.ops[i]);
+                if (perm != null && !perms.contains(perm)) {
+                    perms.add(perm);
+                    permOps.add(tpl.ops[i]);
+                    opToOrder[tpl.ops[i]] = i;
+                }
+            }
+        }
+
+        List<AppOpsManager.PackageOps> pkgs;
+        if (packageName != null) {
+            pkgs = mAppOps.getOpsForPackage(uid, packageName, tpl.ops);
+        } else {
+            pkgs = mAppOps.getPackagesForOps(tpl.ops);
+        }
+
+        if (pkgs != null) {
+            for (int i=0; i<pkgs.size(); i++) {
+                AppOpsManager.PackageOps pkgOps = pkgs.get(i);
+                AppEntry appEntry = getAppEntry(context, appEntries, pkgOps.getPackageName(), null);
+                if (appEntry == null) {
+                    continue;
+                }
+                for (int j=0; j<pkgOps.getOps().size(); j++) {
+                    AppOpsManager.OpEntry opEntry = pkgOps.getOps().get(j);
+                    addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
+                            packageName == null ? 0 : opToOrder[opEntry.getOp()]);
+                }
+            }
+        }
+
+        List<PackageInfo> apps;
+        if (packageName != null) {
+            apps = new ArrayList<PackageInfo>();
+            try {
+                PackageInfo pi = mPm.getPackageInfo(packageName, PackageManager.GET_PERMISSIONS);
+                apps.add(pi);
+            } catch (NameNotFoundException e) {
+            }
+        } else {
+            String[] permsArray = new String[perms.size()];
+            perms.toArray(permsArray);
+            apps = mPm.getPackagesHoldingPermissions(permsArray, 0);
+        }
+        for (int i=0; i<apps.size(); i++) {
+            PackageInfo appInfo = apps.get(i);
+            AppEntry appEntry = getAppEntry(context, appEntries, appInfo.packageName,
+                    appInfo.applicationInfo);
+            if (appEntry == null) {
+                continue;
+            }
+            List<AppOpsManager.OpEntry> dummyOps = null;
+            AppOpsManager.PackageOps pkgOps = null;
+            if (appInfo.requestedPermissions != null) {
+                for (int j=0; j<appInfo.requestedPermissions.length; j++) {
+                    if (appInfo.requestedPermissionsFlags != null) {
+                        if ((appInfo.requestedPermissionsFlags[j]
+                                & PackageInfo.REQUESTED_PERMISSION_GRANTED) == 0) {
+                            if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm "
+                                    + appInfo.requestedPermissions[j] + " not granted; skipping");
+                            break;
+                        }
+                    }
+                    if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + ": requested perm "
+                            + appInfo.requestedPermissions[j]);
+                    for (int k=0; k<perms.size(); k++) {
+                        if (!perms.get(k).equals(appInfo.requestedPermissions[j])) {
+                            continue;
+                        }
+                        if (DEBUG) Log.d(TAG, "Pkg " + appInfo.packageName + " perm " + perms.get(k)
+                                + " has op " + permOps.get(k) + ": " + appEntry.hasOp(permOps.get(k)));
+                        if (appEntry.hasOp(permOps.get(k))) {
+                            continue;
+                        }
+                        if (dummyOps == null) {
+                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();
+                            pkgOps = new AppOpsManager.PackageOps(
+                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
+
+                        }
+                        AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
+                                permOps.get(k), AppOpsManager.MODE_ALLOWED, 0, 0, 0);
+                        dummyOps.add(opEntry);
+                        addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
+                                packageName == null ? 0 : opToOrder[opEntry.getOp()]);
+                    }
+                }
+            }
+        }
+
+        // Sort the list.
+        Collections.sort(entries, APP_OP_COMPARATOR);
+
+        // Done!
+        return entries;
+    }
+}
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
new file mode 100644
index 0000000..b0d9ad1
--- /dev/null
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy
+ * of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.AppOpsManager;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.preference.PreferenceFrameLayout;
+import android.support.v13.app.FragmentPagerAdapter;
+import android.support.v4.view.PagerTabStrip;
+import android.support.v4.view.ViewPager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.settings.R;
+
+public class AppOpsSummary extends Fragment {
+    // layout inflater object used to inflate views
+    private LayoutInflater mInflater;
+    
+    private ViewGroup mContentContainer;
+    private View mRootView;
+    private ViewPager mViewPager;
+
+    CharSequence[] mPageNames;
+    static AppOpsState.OpsTemplate[] sPageTemplates = new AppOpsState.OpsTemplate[] {
+        AppOpsState.LOCATION_TEMPLATE,
+        AppOpsState.PERSONAL_TEMPLATE,
+        AppOpsState.MESSAGING_TEMPLATE,
+        AppOpsState.DEVICE_TEMPLATE
+    };
+
+    int mCurPos;
+
+    class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {
+
+        public MyPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            return new AppOpsCategory(sPageTemplates[position]);
+        }
+
+        @Override
+        public int getCount() {
+            return sPageTemplates.length;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return mPageNames[position];
+        }
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            mCurPos = position;
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+            if (state == ViewPager.SCROLL_STATE_IDLE) {
+                //updateCurrentTab(mCurPos);
+            }
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        // initialize the inflater
+        mInflater = inflater;
+
+        View rootView = mInflater.inflate(R.layout.app_ops_summary,
+                container, false);
+        mContentContainer = container;
+        mRootView = rootView;
+
+        mPageNames = getResources().getTextArray(R.array.app_ops_categories);
+
+        mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
+        MyPagerAdapter adapter = new MyPagerAdapter(getChildFragmentManager());
+        mViewPager.setAdapter(adapter);
+        mViewPager.setOnPageChangeListener(adapter);
+        PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
+        tabs.setTabIndicatorColorResource(android.R.color.holo_blue_light);
+
+        // We have to do this now because PreferenceFrameLayout looks at it
+        // only when the view is added.
+        if (container instanceof PreferenceFrameLayout) {
+            ((PreferenceFrameLayout.LayoutParams) rootView.getLayoutParams()).removeBorders = true;
+        }
+
+        return rootView;
+    }
+}
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index e87d7cf..1c2eb2c 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -237,12 +237,39 @@
         }
     };
 
+    public static final AppFilter DISABLED_FILTER = new AppFilter() {
+        public void init() {
+        }
+        
+        @Override
+        public boolean filterApp(ApplicationInfo info) {
+            if (!info.enabled) {
+                return true;
+            }
+            return false;
+        }
+    };
+
+    public static final AppFilter ALL_ENABLED_FILTER = new AppFilter() {
+        public void init() {
+        }
+        
+        @Override
+        public boolean filterApp(ApplicationInfo info) {
+            if (info.enabled) {
+                return true;
+            }
+            return false;
+        }
+    };
+
     final Context mContext;
     final PackageManager mPm;
     final int mRetrieveFlags;
     PackageIntentReceiver mPackageIntentReceiver;
 
     boolean mResumed;
+    boolean mHaveDisabledApps;
 
     // Information about all applications.  Synchronize on mEntriesMap
     // to protect access to these.
@@ -407,9 +434,11 @@
         // Only the owner can see all apps.
         if (UserHandle.myUserId() == 0) {
             mRetrieveFlags = PackageManager.GET_UNINSTALLED_PACKAGES |
-                    PackageManager.GET_DISABLED_COMPONENTS;
+                    PackageManager.GET_DISABLED_COMPONENTS |
+                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
         } else {
-            mRetrieveFlags = PackageManager.GET_DISABLED_COMPONENTS;
+            mRetrieveFlags = PackageManager.GET_DISABLED_COMPONENTS |
+                    PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS;
         }
 
         /**
@@ -617,15 +646,18 @@
             }
         }
 
+        mHaveDisabledApps = false;
         for (int i=0; i<mApplications.size(); i++) {
             final ApplicationInfo info = mApplications.get(i);
             // Need to trim out any applications that are disabled by
             // something different than the user.
-            if (!info.enabled && info.enabledSetting
-                    != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
-                mApplications.remove(i);
-                i--;
-                continue;
+            if (!info.enabled) {
+                if (info.enabledSetting != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
+                    mApplications.remove(i);
+                    i--;
+                    continue;
+                }
+                mHaveDisabledApps = true;
             }
             final AppEntry entry = mEntriesMap.get(info.packageName);
             if (entry != null) {
@@ -638,6 +670,10 @@
         }
     }
 
+    public boolean haveDisabledApps() {
+        return mHaveDisabledApps;
+    }
+
     void doPauseIfNeededLocked() {
         if (!mResumed) {
             return;
@@ -732,6 +768,13 @@
                     return;
                 }
                 ApplicationInfo info = mPm.getApplicationInfo(pkgName, mRetrieveFlags);
+                if (!info.enabled) {
+                    if (info.enabledSetting
+                            != PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER) {
+                        return;
+                    }
+                    mHaveDisabledApps = true;
+                }
                 mApplications.add(info);
                 if (!mBackgroundHandler.hasMessages(BackgroundHandler.MSG_LOAD_ENTRIES)) {
                     mBackgroundHandler.sendEmptyMessage(BackgroundHandler.MSG_LOAD_ENTRIES);
@@ -757,7 +800,17 @@
                     mEntriesMap.remove(pkgName);
                     mAppEntries.remove(entry);
                 }
+                ApplicationInfo info = mApplications.get(idx);
                 mApplications.remove(idx);
+                if (!info.enabled) {
+                    mHaveDisabledApps = false;
+                    for (int i=0; i<mApplications.size(); i++) {
+                        if (!mApplications.get(i).enabled) {
+                            mHaveDisabledApps = true;
+                            break;
+                        }
+                    }
+                }
                 if (!mMainHandler.hasMessages(MainHandler.MSG_PACKAGE_LIST_CHANGED)) {
                     mMainHandler.sendEmptyMessage(MainHandler.MSG_PACKAGE_LIST_CHANGED);
                 }
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 75c9485..3e9ba54 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -385,7 +385,8 @@
                 ServiceManager.getService(Context.NOTIFICATION_SERVICE));
         boolean enabled = true; // default on
         try {
-            enabled = nm.areNotificationsEnabledForPackage(mAppEntry.info.packageName);
+            enabled = nm.areNotificationsEnabledForPackage(mAppEntry.info.packageName,
+                    mAppEntry.info.uid);
         } catch (android.os.RemoteException ex) {
             // this does not bode well
         }
@@ -537,10 +538,10 @@
         }
     }
 
-    // Utility method to set applicaiton label and icon.
+    // Utility method to set application label and icon.
     private void setAppLabelAndIcon(PackageInfo pkgInfo) {
         final View appSnippet = mRootView.findViewById(R.id.app_snippet);
-        appSnippet.setPadding(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
+        appSnippet.setPaddingRelative(0, appSnippet.getPaddingTop(), 0, appSnippet.getPaddingBottom());
 
         ImageView icon = (ImageView) appSnippet.findViewById(R.id.app_icon);
         mState.ensureIcon(mAppEntry);
@@ -767,7 +768,7 @@
             LinearLayout securityList = (LinearLayout) permsView.findViewById(
                     R.id.security_settings_list);
             securityList.removeAllViews();
-            securityList.addView(asp.getPermissionsView());
+            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);
@@ -1263,7 +1264,7 @@
                 ServiceManager.getService(Context.NOTIFICATION_SERVICE));
         try {
             final boolean enable = mNotificationSwitch.isChecked();
-            nm.setNotificationsEnabledForPackage(packageName, enabled);
+            nm.setNotificationsEnabledForPackage(packageName, mAppEntry.info.uid, enabled);
         } catch (android.os.RemoteException ex) {
             mNotificationSwitch.setChecked(!enabled); // revert
         }
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index d4df397..a223e20 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -161,6 +161,7 @@
     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;
@@ -221,6 +222,7 @@
             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;
@@ -427,6 +429,7 @@
         }
     }
     private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>();
+    private int mNumTabs;
     TabInfo mCurTab = null;
 
     // Size resource used for packages whose size computation failed for some reason
@@ -447,6 +450,7 @@
     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;
     
@@ -464,7 +468,7 @@
 
         @Override
         public int getCount() {
-            return mTabs.size();
+            return mNumTabs;
         }
         
         @Override
@@ -472,6 +476,7 @@
             TabInfo tab = mTabs.get(position);
             View root = tab.build(mInflater, mContentContainer, mRootView);
             container.addView(root);
+            root.setTag(R.id.name, tab);
             return root;
         }
 
@@ -486,6 +491,12 @@
         }
 
         @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;
         }
@@ -607,8 +618,11 @@
                         mWhichSize = SIZE_EXTERNAL;
                     }
                     break;
+                case FILTER_APPS_DISABLED:
+                    filterObj = ApplicationsState.DISABLED_FILTER;
+                    break;
                 default:
-                    filterObj = null;
+                    filterObj = ApplicationsState.ALL_ENABLED_FILTER;
                     break;
             }
             switch (mLastSortMode) {
@@ -869,6 +883,13 @@
                 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();
     }
 
 
@@ -922,6 +943,7 @@
     public void onResume() {
         super.onResume();
         mActivityResumed = true;
+        updateNumTabs();
         updateCurrentTab(mViewPager.getCurrentItem());
         updateOptionsMenu();
     }
@@ -975,6 +997,16 @@
         }
     }
 
+    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);
@@ -1083,6 +1115,8 @@
     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());
@@ -1095,11 +1129,9 @@
                         ApplicationInfo app = apps.get(i);
                         try {
                             if (DEBUG) Log.v(TAG, "Enabling notifications: " + app.packageName);
-                            nm.setNotificationsEnabledForPackage(app.packageName, true);
+                            nm.setNotificationsEnabledForPackage(app.packageName, app.uid, true);
                         } catch (android.os.RemoteException ex) {
                         }
-                        if (DEBUG) Log.v(TAG, "Clearing preferred: " + app.packageName);
-                        pm.clearPackagePreferredActivities(app.packageName);
                         if (!app.enabled) {
                             if (DEBUG) Log.v(TAG, "Enabling app: " + app.packageName);
                             if (pm.getApplicationEnabledSetting(app.packageName)
@@ -1110,16 +1142,9 @@
                             }
                         }
                     }
-                    // We should have cleared all of the preferred apps above;
-                    // just in case some may be lingering, retrieve whatever is
-                    // still set and remove it.
-                    ArrayList<IntentFilter> filters = new ArrayList<IntentFilter>();
-                    ArrayList<ComponentName> prefActivities = new ArrayList<ComponentName>();
-                    pm.getPreferredActivities(filters, prefActivities, null);
-                    for (int i=0; i<prefActivities.size(); i++) {
-                        if (DEBUG) Log.v(TAG, "Clearing preferred: "
-                                + prefActivities.get(i).getPackageName());
-                        pm.clearPackagePreferredActivities(prefActivities.get(i).getPackageName());
+                    try {
+                        mIPm.resetPreferredActivities(UserHandle.myUserId());
+                    } catch (RemoteException e) {
                     }
                     final int[] restrictedUids = npm.getUidsWithPolicy(
                             POLICY_REJECT_METERED_BACKGROUND);
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index 5797dfa..d373fdd 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -462,6 +462,12 @@
                     si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
                             service.service, PackageManager.GET_UNINSTALLED_PACKAGES,
                             UserHandle.getUserId(service.uid));
+
+                    if (si.mServiceInfo == null) {
+                        Log.d("RunningService", "getServiceInfo returned null for: "
+                                + service.service);
+                        return false;
+                    }
                 } catch (RemoteException e) {
                 }
                 si.mDisplayLabel = makeLabel(pm,
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
index fbf24c9..435a659 100755
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -38,6 +38,9 @@
     private BluetoothA2dp mService;
     private boolean mIsProfileReady;
 
+    private final LocalBluetoothAdapter mLocalAdapter;
+    private final CachedBluetoothDeviceManager mDeviceManager;
+
     static final ParcelUuid[] SINK_UUIDS = {
         BluetoothUuid.AudioSink,
         BluetoothUuid.AdvAudioDist,
@@ -56,6 +59,19 @@
         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;
         }
 
@@ -68,10 +84,14 @@
     public boolean isProfileReady() {
         return mIsProfileReady;
     }
-    A2dpProfile(Context context, LocalBluetoothProfileManager profileManager) {
+
+    A2dpProfile(Context context, LocalBluetoothAdapter adapter,
+            CachedBluetoothDeviceManager deviceManager,
+            LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
         mProfileManager = profileManager;
-        BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        adapter.getProfileProxy(context, new A2dpServiceListener(),
+        mLocalAdapter.getProfileProxy(context, new A2dpServiceListener(),
                 BluetoothProfile.A2DP);
     }
 
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index c659f70..80a3d1f 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -16,22 +16,22 @@
 
 package com.android.settings.bluetooth;
 
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothClass;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.graphics.drawable.Drawable;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.text.Html;
 import android.text.TextUtils;
 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.ImageView;
 
 import com.android.settings.R;
@@ -66,7 +66,10 @@
         mCachedDevice = cachedDevice;
 
         if (cachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
-            setWidgetLayoutResource(R.layout.preference_bluetooth);
+            UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
+            if (! um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {
+                setWidgetLayoutResource(R.layout.preference_bluetooth);
+            }
         }
 
         mCachedDevice.registerCallback(this);
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index 940d8d0..9b2a3e8 100755
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -43,6 +43,8 @@
 import com.android.settings.R;
 import android.view.KeyEvent;
 
+import java.util.Locale;
+
 /**
  * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
  * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
@@ -120,7 +122,7 @@
                     Log.e(TAG, "Invalid Confirmation Passkey received, not showing any dialog");
                     return;
                 }
-                mPairingKey = String.format("%06d", passkey);
+                mPairingKey = String.format(Locale.US, "%06d", passkey);
                 createConfirmationDialog(deviceManager);
                 break;
 
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index e9ba39d..ab657e0 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.bluetooth;
 
+import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
+
 import android.app.ActionBar;
 import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
@@ -25,6 +27,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
@@ -32,16 +35,13 @@
 import android.preference.PreferenceScreen;
 import android.util.Log;
 import android.view.Gravity;
-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.Switch;
 import android.widget.TextView;
 
-import com.android.settings.ProgressCategory;
 import com.android.settings.R;
 
 /**
@@ -74,6 +74,8 @@
 
     private final IntentFilter mIntentFilter;
 
+    private UserManager mUserManager;
+
     // accessed from inner class (not private to avoid thunks)
     Preference mMyDevicePreference;
 
@@ -100,6 +102,7 @@
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
         mActivityStarted = (savedInstanceState == null);    // don't auto start scan after rotation
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
@@ -119,7 +122,7 @@
             if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
                 final int padding = activity.getResources().getDimensionPixelSize(
                         R.dimen.action_bar_switch_padding);
-                actionBarSwitch.setPadding(0, 0, padding, 0);
+                actionBarSwitch.setPaddingRelative(0, 0, padding, 0);
                 activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
                         ActionBar.DISPLAY_SHOW_CUSTOM);
                 activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
@@ -167,6 +170,9 @@
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         if (mLocalAdapter == null) return;
+        // If the user is not allowed to configure bluetooth, do not show the menu.
+        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) return;
+
         boolean bluetoothIsEnabled = mLocalAdapter.getBluetoothState() == BluetoothAdapter.STATE_ON;
         boolean isDiscovering = mLocalAdapter.isDiscovering();
         int textId = isDiscovering ? R.string.bluetooth_searching_for_devices :
@@ -213,6 +219,7 @@
     }
 
     private void startScanning() {
+        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) return;
         if (!mAvailableDevicesCategoryIsPresent) {
             getPreferenceScreen().addPreference(mAvailableDevicesCategory);
         }
@@ -259,12 +266,14 @@
                 mMyDevicePreference.setEnabled(true);
                 preferenceScreen.addPreference(mMyDevicePreference);
 
-                if (mDiscoverableEnabler == null) {
-                    mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
-                            mLocalAdapter, mMyDevicePreference);
-                    mDiscoverableEnabler.resume();
-                    LocalBluetoothManager.getInstance(getActivity()).setDiscoverableEnabler(
-                            mDiscoverableEnabler);
+                if (! mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {
+                    if (mDiscoverableEnabler == null) {
+                        mDiscoverableEnabler = new BluetoothDiscoverableEnabler(getActivity(),
+                                mLocalAdapter, mMyDevicePreference);
+                        mDiscoverableEnabler.resume();
+                        LocalBluetoothManager.getInstance(getActivity()).setDiscoverableEnabler(
+                                mDiscoverableEnabler);
+                    }
                 }
 
                 // Paired devices category
@@ -278,7 +287,9 @@
                         BluetoothDeviceFilter.BONDED_DEVICE_FILTER);
                 int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount();
 
-                mDiscoverableEnabler.setNumberOfPairedDevices(numberOfPairedDevices);
+                if (mDiscoverableEnabler != null) {
+                    mDiscoverableEnabler.setNumberOfPairedDevices(numberOfPairedDevices);
+                }
 
                 // Available devices category
                 if (mAvailableDevicesCategory == null) {
@@ -286,9 +297,11 @@
                 } else {
                     mAvailableDevicesCategory.removeAll();
                 }
-                addDeviceCategory(mAvailableDevicesCategory,
-                        R.string.bluetooth_preference_found_devices,
-                        BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
+                if (! mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) {
+                    addDeviceCategory(mAvailableDevicesCategory,
+                            R.string.bluetooth_preference_found_devices,
+                            BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
+                }
                 int numberOfAvailableDevices = mAvailableDevicesCategory.getPreferenceCount();
                 mAvailableDevicesCategoryIsPresent = true;
 
@@ -353,6 +366,8 @@
         public void onClick(View v) {
             // User clicked on advanced options icon for a device in the list
             if (v.getTag() instanceof CachedBluetoothDevice) {
+                if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)) return;
+
                 CachedBluetoothDevice device = (CachedBluetoothDevice) v.getTag();
 
                 Bundle args = new Bundle(1);
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 87d31e7..027ceed 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -16,11 +16,15 @@
 
 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;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.UserManager;
 
 import com.android.settings.R;
 
@@ -51,7 +55,9 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         getActivity().setTitle(getString(R.string.device_picker));
-        mStartScanOnResume = (savedInstanceState == null);  // don't start scan after rotation
+        UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+        mStartScanOnResume = !um.hasUserRestriction(DISALLOW_CONFIG_BLUETOOTH)
+                && (savedInstanceState == null);  // don't start scan after rotation
     }
 
     @Override
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
index 83c8e8e..1caeb65 100755
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -62,19 +62,19 @@
         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 of the
-            // headset device.
+            // We just bound to the service, so refresh the UI for any connected HFP devices.
             List<BluetoothDevice> deviceList = mService.getConnectedDevices();
-            if (!deviceList.isEmpty()) {
-                BluetoothDevice firstDevice = deviceList.get(0);
-                CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
+            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: " + firstDevice);
-                    device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
+                    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();
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
index c502850..8df2845 100755
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -38,6 +38,10 @@
     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
@@ -50,6 +54,19 @@
         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;
         }
 
@@ -63,7 +80,12 @@
         return mIsProfileReady;
     }
 
-    HidProfile(Context context, LocalBluetoothAdapter adapter) {
+    HidProfile(Context context, LocalBluetoothAdapter adapter,
+        CachedBluetoothDeviceManager deviceManager,
+        LocalBluetoothProfileManager profileManager) {
+        mLocalAdapter = adapter;
+        mDeviceManager = deviceManager;
+        mProfileManager = profileManager;
         adapter.getProfileProxy(context, new InputDeviceServiceListener(),
                 BluetoothProfile.INPUT_DEVICE);
     }
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
index 916ef9e..5d254ae 100755
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -111,7 +111,7 @@
         }
 
         // Always add HID and PAN profiles
-        mHidProfile = new HidProfile(context, mLocalAdapter);
+        mHidProfile = new HidProfile(context, mLocalAdapter, mDeviceManager, this);
         addProfile(mHidProfile, HidProfile.NAME,
                 BluetoothInputDevice.ACTION_CONNECTION_STATE_CHANGED);
 
@@ -138,7 +138,7 @@
         if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
             if (mA2dpProfile == null) {
                 Log.d(TAG, "Adding local A2DP profile");
-                mA2dpProfile = new A2dpProfile(mContext, this);
+                mA2dpProfile = new A2dpProfile(mContext, mLocalAdapter, mDeviceManager, this);
                 addProfile(mA2dpProfile, A2dpProfile.NAME,
                         BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
             }
diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 825a7be..d03f6dc 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -33,6 +33,7 @@
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserManager;
 import android.os.storage.IMountService;
 import android.os.storage.StorageEventListener;
 import android.os.storage.StorageManager;
@@ -49,7 +50,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.google.common.collect.Lists;
+import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -174,7 +175,10 @@
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         final MenuItem usb = menu.findItem(R.id.storage_usb);
-        usb.setVisible(!isMassStorageEnabled());
+        UserManager um = (UserManager)getActivity().getSystemService(Context.USER_SERVICE);
+        boolean usbItemVisible = !isMassStorageEnabled()
+                && !um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER);
+        usb.setVisible(usbItemVisible);
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/StorageMeasurement.java b/src/com/android/settings/deviceinfo/StorageMeasurement.java
index a22ba77..34ef62b 100644
--- a/src/com/android/settings/deviceinfo/StorageMeasurement.java
+++ b/src/com/android/settings/deviceinfo/StorageMeasurement.java
@@ -41,7 +41,7 @@
 
 import com.android.internal.app.IMediaContainerService;
 import com.google.android.collect.Maps;
-import com.google.common.collect.Sets;
+import com.google.android.collect.Sets;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -338,8 +338,8 @@
                             sendMessage(obtainMessage(MSG_CONNECTED, mDefaultContainer));
                         } else {
                             Intent service = new Intent().setComponent(DEFAULT_CONTAINER_COMPONENT);
-                            context.bindService(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
-                                    UserHandle.USER_OWNER);
+                            context.bindServiceAsUser(service, mDefContainerConn, Context.BIND_AUTO_CREATE,
+                                    UserHandle.OWNER);
                         }
                     }
                     break;
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
index 2f3fd03..371c772 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -16,16 +16,14 @@
 
 package com.android.settings.deviceinfo;
 
-import com.android.settings.R;
-import com.google.common.collect.Lists;
-
 import android.content.Context;
 import android.preference.Preference;
 import android.util.AttributeSet;
 import android.view.View;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import com.android.settings.R;
+import com.google.android.collect.Lists;
+
 import java.util.Collections;
 import java.util.List;
 
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index b8290fc..42de2fd 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -16,20 +16,16 @@
 
 package com.android.settings.deviceinfo;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.BroadcastReceiver;
-import android.content.ContentQueryMap;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hardware.usb.UsbManager;
 import android.os.Bundle;
+import android.os.UserManager;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -73,6 +69,12 @@
         mMtp = (CheckBoxPreference)root.findPreference(KEY_MTP);
         mPtp = (CheckBoxPreference)root.findPreference(KEY_PTP);
 
+        UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+            mMtp.setEnabled(false);
+            mPtp.setEnabled(false);
+        }
+
         return root;
     }
 
@@ -112,8 +114,12 @@
             mMtp.setChecked(false);
             mPtp.setChecked(false);
         }
-
-        if (!mUsbAccessoryMode) {
+        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);
+        } 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);
@@ -123,7 +129,6 @@
             mMtp.setEnabled(false);
             mPtp.setEnabled(false);
         }
-
     }
 
     @Override
@@ -134,22 +139,23 @@
         if (Utils.isMonkeyRunning()) {
             return true;
         }
-        // temporary hack - using check boxes as radio buttons
-        // don't allow unchecking them
-        if (preference instanceof CheckBoxPreference) {
-            CheckBoxPreference checkBox = (CheckBoxPreference)preference;
-            if (!checkBox.isChecked()) {
-                checkBox.setChecked(true);
-                return true;
-            }
+        // If this user is disallowed from using USB, don't handle their attempts to change the
+        // setting.
+        UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (um.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+            return true;
         }
-        if (preference == mMtp) {
-            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
-            updateToggles(UsbManager.USB_FUNCTION_MTP);
-        } else if (preference == mPtp) {
-            mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
-            updateToggles(UsbManager.USB_FUNCTION_PTP);
+
+        String function = "none";
+        if (preference == mMtp && mMtp.isChecked()) {
+            function = UsbManager.USB_FUNCTION_MTP;
+        } else if (preference == mPtp && mPtp.isChecked()) {
+            function = UsbManager.USB_FUNCTION_PTP;
         }
+
+        mUsbManager.setCurrentFunction(function, true);
+        updateToggles(function);
+
         return true;
     }
 }
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index a229888..5145789 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -557,77 +557,77 @@
                             lastX = x;
                             lastY = y;
                         }
+                    }
 
-                        final boolean charging =
-                            (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
-                        if (charging != lastCharging) {
-                            if (charging) {
-                                mChargingPath.moveTo(x, h-mChargingOffset);
-                            } else {
-                                mChargingPath.lineTo(x, h-mChargingOffset);
-                            }
-                            lastCharging = charging;
+                    final boolean charging =
+                        (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
+                    if (charging != lastCharging) {
+                        if (charging) {
+                            mChargingPath.moveTo(x, h-mChargingOffset);
+                        } else {
+                            mChargingPath.lineTo(x, h-mChargingOffset);
                         }
+                        lastCharging = charging;
+                    }
 
-                        final boolean screenOn =
-                            (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
-                        if (screenOn != lastScreenOn) {
-                            if (screenOn) {
-                                mScreenOnPath.moveTo(x, h-mScreenOnOffset);
-                            } else {
-                                mScreenOnPath.lineTo(x, h-mScreenOnOffset);
-                            }
-                            lastScreenOn = screenOn;
+                    final boolean screenOn =
+                        (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
+                    if (screenOn != lastScreenOn) {
+                        if (screenOn) {
+                            mScreenOnPath.moveTo(x, h-mScreenOnOffset);
+                        } else {
+                            mScreenOnPath.lineTo(x, h-mScreenOnOffset);
                         }
+                        lastScreenOn = screenOn;
+                    }
 
-                        final boolean gpsOn =
-                            (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-                        if (gpsOn != lastGpsOn) {
-                            if (gpsOn) {
-                                mGpsOnPath.moveTo(x, h-mGpsOnOffset);
-                            } else {
-                                mGpsOnPath.lineTo(x, h-mGpsOnOffset);
-                            }
-                            lastGpsOn = gpsOn;
+                    final boolean gpsOn =
+                        (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+                    if (gpsOn != lastGpsOn) {
+                        if (gpsOn) {
+                            mGpsOnPath.moveTo(x, h-mGpsOnOffset);
+                        } else {
+                            mGpsOnPath.lineTo(x, h-mGpsOnOffset);
                         }
+                        lastGpsOn = gpsOn;
+                    }
 
-                        final boolean wifiRunning =
-                            (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
-                        if (wifiRunning != lastWifiRunning) {
-                            if (wifiRunning) {
-                                mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
-                            } else {
-                                mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
-                            }
-                            lastWifiRunning = wifiRunning;
+                    final boolean wifiRunning =
+                        (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+                    if (wifiRunning != lastWifiRunning) {
+                        if (wifiRunning) {
+                            mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
+                        } else {
+                            mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
                         }
+                        lastWifiRunning = wifiRunning;
+                    }
 
-                        final boolean wakeLock =
-                            (rec.states&HistoryItem.STATE_WAKE_LOCK_FLAG) != 0;
-                        if (wakeLock != lastWakeLock) {
-                            if (wakeLock) {
-                                mWakeLockPath.moveTo(x, h-mWakeLockOffset);
-                            } else {
-                                mWakeLockPath.lineTo(x, h-mWakeLockOffset);
-                            }
-                            lastWakeLock = wakeLock;
+                    final boolean wakeLock =
+                        (rec.states&HistoryItem.STATE_WAKE_LOCK_FLAG) != 0;
+                    if (wakeLock != lastWakeLock) {
+                        if (wakeLock) {
+                            mWakeLockPath.moveTo(x, h-mWakeLockOffset);
+                        } else {
+                            mWakeLockPath.lineTo(x, h-mWakeLockOffset);
                         }
+                        lastWakeLock = wakeLock;
+                    }
 
-                        if (mLargeMode && mHavePhoneSignal) {
-                            int bin;
-                            if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
-                                    >> HistoryItem.STATE_PHONE_STATE_SHIFT)
-                                    == ServiceState.STATE_POWER_OFF) {
-                                bin = 0;
-                            } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
-                                bin = 1;
-                            } else {
-                                bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
-                                        >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
-                                bin += 2;
-                            }
-                            mPhoneSignalChart.addTick(x, bin);
+                    if (mLargeMode && mHavePhoneSignal) {
+                        int bin;
+                        if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
+                                >> HistoryItem.STATE_PHONE_STATE_SHIFT)
+                                == ServiceState.STATE_POWER_OFF) {
+                            bin = 0;
+                        } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
+                            bin = 1;
+                        } else {
+                            bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
+                                    >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
+                            bin += 2;
                         }
+                        mPhoneSignalChart.addTick(x, bin);
                     }
 
                 } else if (rec.cmd != BatteryStats.HistoryItem.CMD_OVERFLOW) {
diff --git a/src/com/android/settings/fuelgauge/BatterySipper.java b/src/com/android/settings/fuelgauge/BatterySipper.java
index ffc6651..9a8e783 100644
--- a/src/com/android/settings/fuelgauge/BatterySipper.java
+++ b/src/com/android/settings/fuelgauge/BatterySipper.java
@@ -32,7 +32,8 @@
 
 class BatterySipper implements Comparable<BatterySipper> {
     final Context mContext;
-    final HashMap<String,UidToDetail> mUidCache = new HashMap<String,UidToDetail>();
+    /* Cache cleared when PowerUsageSummary is destroyed */
+    static final HashMap<String,UidToDetail> sUidCache = new HashMap<String,UidToDetail>();
     final ArrayList<BatterySipper> mRequestQueue;
     final Handler mHandler;
     String name;
@@ -99,8 +100,8 @@
     void getQuickNameIconForUid(Uid uidObj) {
         final int uid = uidObj.getUid();
         final String uidString = Integer.toString(uid);
-        if (mUidCache.containsKey(uidString)) {
-            UidToDetail utd = mUidCache.get(uidString);
+        if (sUidCache.containsKey(uidString)) {
+            UidToDetail utd = sUidCache.get(uidString);
             defaultPackageName = utd.packageName;
             name = utd.name;
             icon = utd.icon;
@@ -193,7 +194,7 @@
         utd.name = name;
         utd.icon = icon;
         utd.packageName = defaultPackageName;
-        mUidCache.put(uidString, utd);
+        sUidCache.put(uidString, utd);
         mHandler.sendMessage(mHandler.obtainMessage(PowerUsageSummary.MSG_UPDATE_NAME_ICON, this));
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 0a6e2ab..2a3d5f8 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -22,6 +22,7 @@
 import android.content.IntentFilter;
 import android.content.pm.UserInfo;
 import android.graphics.drawable.Drawable;
+import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.net.Uri;
 import android.os.BatteryStats;
@@ -129,6 +130,8 @@
                 String batterySummary = context.getResources().getString(
                         R.string.power_usage_level_and_status, batteryLevel, batteryStatus);
                 mBatteryStatusPref.setTitle(batterySummary);
+                mStats = null;
+                refreshStats();
             }
         }
     };
@@ -175,6 +178,8 @@
         super.onDestroy();
         if (getActivity().isChangingConfigurations()) {
             sStatsXfer = mStats;
+        } else {
+            BatterySipper.sUidCache.clear();
         }
     }
 
@@ -557,20 +562,23 @@
             for (Map.Entry<Integer, ? extends BatteryStats.Uid.Sensor> sensorEntry
                     : sensorStats.entrySet()) {
                 Uid.Sensor sensor = sensorEntry.getValue();
-                int sensorType = sensor.getHandle();
+                int sensorHandle = sensor.getHandle();
                 BatteryStats.Timer timer = sensor.getSensorTime();
                 long sensorTime = timer.getTotalTimeLocked(uSecTime, which) / 1000;
                 double multiplier = 0;
-                switch (sensorType) {
+                switch (sensorHandle) {
                     case Uid.Sensor.GPS:
                         multiplier = mPowerProfile.getAveragePower(PowerProfile.POWER_GPS_ON);
                         gpsTime = sensorTime;
                         break;
                     default:
-                        android.hardware.Sensor sensorData =
-                                sensorManager.getDefaultSensor(sensorType);
-                        if (sensorData != null) {
-                            multiplier = sensorData.getPower();
+                        List<Sensor> sensorList = sensorManager.getSensorList(
+                                android.hardware.Sensor.TYPE_ALL);
+                        for (android.hardware.Sensor s : sensorList) {
+                            if (s.getHandle() == sensorHandle) {
+                                multiplier = s.getPower();
+                                break;
+                            }
                         }
                 }
                 p = (multiplier * sensorTime) / 1000;
@@ -598,7 +606,7 @@
                 app.tcpBytesSent = tcpBytesSent;
                 if (u.getUid() == Process.WIFI_UID) {
                     mWifiSippers.add(app);
-                } else if (u.getUid() == Process.BLUETOOTH_GID) {
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
                     mBluetoothSippers.add(app);
                 } else if (userId != UserHandle.myUserId()
                         && UserHandle.getAppId(u.getUid()) >= Process.FIRST_APPLICATION_UID) {
@@ -619,7 +627,7 @@
             if (power != 0) {
                 if (u.getUid() == Process.WIFI_UID) {
                     mWifiPower += power;
-                } else if (u.getUid() == Process.BLUETOOTH_GID) {
+                } else if (u.getUid() == Process.BLUETOOTH_UID) {
                     mBluetoothPower += power;
                 } else if (isOtherUser) {
                     Double userPower = mUserPower.get(userId);
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index c2ff0d9..2a5adb1 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -238,7 +238,16 @@
                 // and want to pretend that the language is valid for all locales.
                 // We need a way to support languages that aren't tied to a particular
                 // locale instead of hiding the locale qualifier.
-                if (hasOnlyOneLanguageInstance(language,
+                if (language.equals("zz")) {
+                    String country = conf.locale.getCountry();
+                    if (country.equals("ZZ")) {
+                        localeString = "[Developer] Accented English (zz_ZZ)";
+                    } else if (country.equals("ZY")) {
+                        localeString = "[Developer] Fake Bi-Directional (zz_ZY)";
+                    } else {
+                        localeString = "";
+                    }
+                } else if (hasOnlyOneLanguageInstance(language,
                         Resources.getSystem().getAssets().getLocales())) {
                     localeString = conf.locale.getDisplayLanguage(conf.locale);
                 } else {
diff --git a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
index 13f4435..f3addf3 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndSubtypeEnabler.java
@@ -36,10 +36,13 @@
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.InputMethodSubtype;
 
+import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 
 public class InputMethodAndSubtypeEnabler extends SettingsPreferenceFragment {
     private static final String TAG =InputMethodAndSubtypeEnabler.class.getSimpleName();
@@ -54,6 +57,7 @@
     private String mInputMethodId;
     private String mTitle;
     private String mSystemLocale = "";
+    private Collator mCollator = Collator.getInstance();
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -84,7 +88,9 @@
             }
         }
 
-        mSystemLocale = config.locale.toString();
+        final Locale locale = config.locale;
+        mSystemLocale = locale.toString();
+        mCollator = Collator.getInstance(locale);
         onCreateIMM();
         setPreferenceScreen(createPreferenceHierarchy());
     }
@@ -259,7 +265,7 @@
                         }
                     } else {
                         final CheckBoxPreference chkbxPref = new SubtypeCheckBoxPreference(
-                                context, subtype.getLocale(), mSystemLocale);
+                                context, subtype.getLocale(), mSystemLocale, mCollator);
                         chkbxPref.setKey(imiId + subtype.hashCode());
                         chkbxPref.setTitle(subtypeLabel);
                         subtypePreferences.add(chkbxPref);
@@ -370,9 +376,10 @@
     private static class SubtypeCheckBoxPreference extends CheckBoxPreference {
         private final boolean mIsSystemLocale;
         private final boolean mIsSystemLanguage;
+        private final Collator mCollator;
 
         public SubtypeCheckBoxPreference(
-                Context context, String subtypeLocale, String systemLocale) {
+                Context context, String subtypeLocale, String systemLocale, Collator collator) {
             super(context);
             if (TextUtils.isEmpty(subtypeLocale)) {
                 mIsSystemLocale = false;
@@ -382,6 +389,7 @@
                 mIsSystemLanguage = mIsSystemLocale
                         || subtypeLocale.startsWith(systemLocale.substring(0, 2));
             }
+            mCollator = collator;
         }
 
         @Override
@@ -411,10 +419,10 @@
                 if (TextUtils.isEmpty(t1)) {
                     return -1;
                 }
-                return t0.toString().compareTo(t1.toString());
+                return mCollator.compare(t0.toString(), t1.toString());
             } else {
                 Log.w(TAG, "Illegal preference type.");
-                return -1;
+                return super.compareTo(p);
             }
         }
     }
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index f064c08..56b6e67 100644
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -28,6 +28,7 @@
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
+import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -42,11 +43,11 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.text.Collator;
 import java.util.Comparator;
 import java.util.List;
 
-public class InputMethodPreference extends CheckBoxPreference
-        implements Comparator<InputMethodPreference> {
+public class InputMethodPreference extends CheckBoxPreference {
     private static final String TAG = InputMethodPreference.class.getSimpleName();
     private final SettingsPreferenceFragment mFragment;
     private final InputMethodInfo mImi;
@@ -54,6 +55,7 @@
     private final Intent mSettingsIntent;
     private final boolean mAlwaysChecked;
     private final boolean mIsSystemIme;
+    private final Collator mCollator;
 
     private AlertDialog mDialog = null;
     private ImageView mInputMethodSettingsButton;
@@ -95,6 +97,7 @@
         if (mAlwaysChecked) {
             setEnabled(false);
         }
+        mCollator = Collator.getInstance(fragment.getResources().getConfiguration().locale);
     }
 
     @Override
@@ -276,13 +279,26 @@
     }
 
     @Override
-    public int compare(InputMethodPreference arg0, InputMethodPreference arg1) {
-        if (arg0.isEnabled() == arg0.isEnabled()) {
-            return arg0.mImi.getId().compareTo(arg1.mImi.getId());
-        } else {
-            // Prefer system IMEs
-            return arg0.isEnabled() ? 1 : -1;
+    public int compareTo(Preference p) {
+        if (!(p instanceof InputMethodPreference)) {
+            return super.compareTo(p);
         }
+        final InputMethodPreference imp = (InputMethodPreference) p;
+        final boolean priority0 = mIsSystemIme && mAlwaysChecked;
+        final boolean priority1 = imp.mIsSystemIme && imp.mAlwaysChecked;
+        if (priority0 == priority1) {
+            final CharSequence t0 = getTitle();
+            final CharSequence t1 = imp.getTitle();
+            if (TextUtils.isEmpty(t0)) {
+                return 1;
+            }
+            if (TextUtils.isEmpty(t1)) {
+                return -1;
+            }
+            return mCollator.compare(t0.toString(), t1.toString());
+        }
+        // Prefer always checked system IMEs
+        return priority0 ? -1 : 1;
     }
 
     private void saveImeSettings() {
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index ad12311..fb000db 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -101,10 +101,10 @@
     }
 
     private Preference buildWifiPref(Context context, WifiConfiguration config) {
-        final String networkId = removeDoubleQuotes(config.SSID);
+        final String networkId = config.SSID;
         final NetworkTemplate template = NetworkTemplate.buildTemplateWifi(networkId);
         final MeteredPreference pref = new MeteredPreference(context, template);
-        pref.setTitle(networkId);
+        pref.setTitle(removeDoubleQuotes(networkId));
         return pref;
     }
 
@@ -119,7 +119,7 @@
             setPersistent(false);
 
             mBinding = true;
-            final NetworkPolicy policy = mPolicyEditor.getPolicy(template);
+            final NetworkPolicy policy = mPolicyEditor.getPolicyMaybeUnquoted(template);
             if (policy != null) {
                 if (policy.limitBytes != LIMIT_DISABLED) {
                     setChecked(true);
diff --git a/src/com/android/settings/net/NetworkPolicyEditor.java b/src/com/android/settings/net/NetworkPolicyEditor.java
index 5fe4c06..bfdaf99 100644
--- a/src/com/android/settings/net/NetworkPolicyEditor.java
+++ b/src/com/android/settings/net/NetworkPolicyEditor.java
@@ -31,7 +31,9 @@
 import android.net.NetworkPolicy;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkTemplate;
+import android.net.wifi.WifiInfo;
 import android.os.AsyncTask;
+import android.text.TextUtils;
 import android.text.format.Time;
 
 import com.android.internal.util.Objects;
@@ -125,6 +127,15 @@
         return null;
     }
 
+    public NetworkPolicy getPolicyMaybeUnquoted(NetworkTemplate template) {
+        NetworkPolicy policy = getPolicy(template);
+        if (policy != null) {
+            return policy;
+        } else {
+            return getPolicy(buildUnquotedNetworkTemplate(template));
+        }
+    }
+
     @Deprecated
     private static NetworkPolicy buildDefaultPolicy(NetworkTemplate template) {
         // TODO: move this into framework to share with NetworkPolicyManagerService
@@ -186,7 +197,7 @@
     }
 
     public boolean getPolicyMetered(NetworkTemplate template) {
-        final NetworkPolicy policy = getPolicy(template);
+        NetworkPolicy policy = getPolicy(template);
         if (policy != null) {
             return policy.metered;
         } else {
@@ -221,6 +232,14 @@
             }
         }
 
+        // Remove legacy unquoted policies while we're here
+        final NetworkTemplate unquoted = buildUnquotedNetworkTemplate(template);
+        final NetworkPolicy unquotedPolicy = getPolicy(unquoted);
+        if (unquotedPolicy != null) {
+            mPolicies.remove(unquotedPolicy);
+            modified = true;
+        }
+
         if (modified) writeAsync();
     }
 
@@ -314,4 +333,21 @@
             return false;
         }
     }
+
+    /**
+     * Build a revised {@link NetworkTemplate} that matches the same rule, but
+     * with an unquoted {@link NetworkTemplate#getNetworkId()}. Used to work
+     * around legacy bugs.
+     */
+    private static NetworkTemplate buildUnquotedNetworkTemplate(NetworkTemplate template) {
+        if (template == null) return null;
+        final String networkId = template.getNetworkId();
+        final String strippedNetworkId = WifiInfo.removeDoubleQuotes(networkId);
+        if (!TextUtils.equals(strippedNetworkId, networkId)) {
+            return new NetworkTemplate(
+                    template.getMatchRule(), template.getSubscriberId(), strippedNetworkId);
+        } else {
+            return null;
+        }
+    }
 }
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index 032681a..158ca78 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -35,12 +35,10 @@
 public class AndroidBeam extends Fragment
         implements CompoundButton.OnCheckedChangeListener {
     private View mView;
-    private ImageView mImageView;
     private NfcAdapter mNfcAdapter;
     private Switch mActionBarSwitch;
     private CharSequence mOldActivityTitle;
 
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -49,20 +47,17 @@
         mActionBarSwitch = new Switch(activity);
 
         if (activity instanceof PreferenceActivity) {
-            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
-                final int padding = activity.getResources().getDimensionPixelSize(
-                        R.dimen.action_bar_switch_padding);
-                mActionBarSwitch.setPadding(0, 0, padding, 0);
-                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                        ActionBar.DISPLAY_SHOW_CUSTOM);
-                activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        ActionBar.LayoutParams.WRAP_CONTENT,
-                        Gravity.CENTER_VERTICAL | Gravity.END));
-                if (!preferenceActivity.onIsMultiPane() || preferenceActivity.onIsHidingHeaders()) {
-                    mOldActivityTitle = getActivity().getTitle();
-                    activity.getActionBar().setTitle(R.string.android_beam_settings_title);
-                }
+            final int padding = activity.getResources().getDimensionPixelSize(
+                    R.dimen.action_bar_switch_padding);
+            mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
+            activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                    ActionBar.DISPLAY_SHOW_CUSTOM);
+            activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    ActionBar.LayoutParams.WRAP_CONTENT,
+                    Gravity.CENTER_VERTICAL | Gravity.END));
+            mOldActivityTitle = activity.getActionBar().getTitle();
+            activity.getActionBar().setTitle(R.string.android_beam_settings_title);
         }
 
         mActionBarSwitch.setOnCheckedChangeListener(this);
@@ -78,13 +73,14 @@
         initView(mView);
         return mView;
     }
+
     @Override
     public void onDestroyView() {
+        super.onDestroyView();
         getActivity().getActionBar().setCustomView(null);
         if (mOldActivityTitle != null) {
             getActivity().getActionBar().setTitle(mOldActivityTitle);
         }
-        super.onDestroyView();
     }
 
     private void initView(View view) {
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 6718ab0..8f83bbc 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -26,7 +26,6 @@
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.ListPreference;
@@ -36,14 +35,17 @@
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.speech.tts.TextToSpeech;
+import android.speech.tts.UtteranceProgressListener;
 import android.speech.tts.TextToSpeech.EngineInfo;
 import android.speech.tts.TtsEngines;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Checkable;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 public class TextToSpeechSettings extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener,
@@ -137,9 +139,28 @@
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener);
         mEnginesHelper = new TtsEngines(getActivity().getApplicationContext());
 
+        setTtsUtteranceProgressListener();
         initSettings();
     }
 
+    private void setTtsUtteranceProgressListener() {
+        if (mTts == null) {
+            return;
+        }
+        mTts.setOnUtteranceProgressListener(new UtteranceProgressListener() {
+            @Override
+            public void onStart(String utteranceId) {}
+
+            @Override
+            public void onDone(String utteranceId) {}
+
+            @Override
+            public void onError(String utteranceId) {
+                Log.e(TAG, "Error while trying to synthesize sample text");
+            }
+        });
+    }
+
     @Override
     public void onDestroy() {
         super.onDestroy();
@@ -193,7 +214,13 @@
 
         if (TextUtils.isEmpty(currentEngine)) currentEngine = mTts.getDefaultEngine();
 
-        Locale currentLocale = mTts.getLanguage();
+
+        Locale defaultLocale = mTts.getDefaultLanguage();
+        if (defaultLocale == null) {
+            Log.e(TAG, "Failed to get default language from engine " + currentEngine);
+            return;
+        }
+        mTts.setLanguage(defaultLocale);
 
         // TODO: This is currently a hidden private API. The intent extras
         // and the intent action should be made public if we intend to make this
@@ -201,11 +228,9 @@
         // doesn't work.
         Intent intent = new Intent(TextToSpeech.Engine.ACTION_GET_SAMPLE_TEXT);
 
-        if (currentLocale != null) {
-            intent.putExtra("language", currentLocale.getLanguage());
-            intent.putExtra("country", currentLocale.getCountry());
-            intent.putExtra("variant", currentLocale.getVariant());
-        }
+        intent.putExtra("language", defaultLocale.getLanguage());
+        intent.putExtra("country", defaultLocale.getCountry());
+        intent.putExtra("variant", defaultLocale.getVariant());
         intent.setPackage(currentEngine);
 
         try {
@@ -258,6 +283,12 @@
         return null;
     }
 
+    private boolean isNetworkRequiredForSynthesis() {
+        Set<String> features = mTts.getFeatures(mTts.getLanguage());
+        return features.contains(TextToSpeech.Engine.KEY_FEATURE_NETWORK_SYNTHESIS) &&
+                !features.contains(TextToSpeech.Engine.KEY_FEATURE_EMBEDDED_SYNTHESIS);
+    }
+
     private void onSampleTextReceived(int resultCode, Intent data) {
         String sample = getDefaultSampleString();
 
@@ -273,7 +304,18 @@
         if (sample != null && mTts != null) {
             // The engine is guaranteed to have been initialized here
             // because this preference is not enabled otherwise.
-            mTts.speak(sample, TextToSpeech.QUEUE_FLUSH, null);
+
+            final boolean networkRequired = isNetworkRequiredForSynthesis();
+            if (!networkRequired || networkRequired &&
+                    (mTts.isLanguageAvailable(mTts.getLanguage()) >= TextToSpeech.LANG_AVAILABLE)) {
+                HashMap<String, String> params = new HashMap<String, String>();
+                params.put(TextToSpeech.Engine.KEY_PARAM_UTTERANCE_ID, "Sample");
+
+                mTts.speak(sample, TextToSpeech.QUEUE_FLUSH, params);
+            } else {
+                Log.w(TAG, "Network required for sample synthesis for requested language");
+                displayNetworkAlert();
+            }
         } else {
             // TODO: Display an error here to the user.
             Log.e(TAG, "Did not have a sample string for the requested language");
@@ -319,22 +361,13 @@
         mDefaultRatePref.setEnabled(enable);
     }
 
-    private void displayDataAlert(final String key) {
-        Log.i(TAG, "Displaying data alert for :" + key);
+    private void displayNetworkAlert() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setTitle(android.R.string.dialog_alert_title);
         builder.setIconAttribute(android.R.attr.alertDialogIcon);
-        builder.setMessage(getActivity().getString(
-                R.string.tts_engine_security_warning, mEnginesHelper.getEngineInfo(key).label));
-        builder.setCancelable(true);
-        builder.setPositiveButton(android.R.string.ok,
-                new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                       updateDefaultEngine(key);
-                    }
-                });
-        builder.setNegativeButton(android.R.string.cancel, null);
+        builder.setMessage(getActivity().getString(R.string.tts_engine_network_required));
+        builder.setCancelable(false);
+        builder.setPositiveButton(android.R.string.ok, null);
 
         AlertDialog dialog = builder.create();
         dialog.show();
@@ -369,6 +402,7 @@
         // the app binds successfully to the engine.
         if (DBG) Log.d(TAG, "Updating engine : Attempting to connect to engine: " + engine);
         mTts = new TextToSpeech(getActivity().getApplicationContext(), mUpdateListener, engine);
+        setTtsUtteranceProgressListener();
     }
 
     /*
@@ -390,6 +424,7 @@
                 // null if the previous bind to this engine failed.
                 mTts = new TextToSpeech(getActivity().getApplicationContext(), mInitListener,
                         mPreviousEngine);
+                setTtsUtteranceProgressListener();
             }
             mPreviousEngine = null;
         }
@@ -443,11 +478,6 @@
         updateWidgetState(true);
     }
 
-    private boolean shouldDisplayDataAlert(String engine) {
-        final EngineInfo info = mEnginesHelper.getEngineInfo(engine);
-        return !info.system;
-    }
-
     @Override
     public Checkable getCurrentChecked() {
         return mCurrentChecked;
@@ -466,11 +496,7 @@
     @Override
     public void setCurrentKey(String key) {
         mCurrentEngine = key;
-        if (shouldDisplayDataAlert(mCurrentEngine)) {
-            displayDataAlert(mCurrentEngine);
-        } else {
-            updateDefaultEngine(mCurrentEngine);
-        }
+        updateDefaultEngine(mCurrentEngine);
     }
 
 }
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
index 21ef81d..486fdf8 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -16,12 +16,15 @@
 
 package com.android.settings.tts;
 
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.speech.tts.TextToSpeech.EngineInfo;
+import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Checkable;
@@ -35,6 +38,8 @@
 
 public class TtsEnginePreference extends Preference {
 
+    private static final String TAG = "TtsEnginePreference";
+
     /**
      * Key for the name of the TTS engine passed in to the engine
      * settings fragment {@link TtsEngineSettingsFragment}.
@@ -182,22 +187,69 @@
         }
     }
 
-    private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) {
+    private boolean shouldDisplayDataAlert() {
+        return !mEngineInfo.system;
+    }
+
+
+    private void displayDataAlert(
+            DialogInterface.OnClickListener positiveOnClickListener,
+            DialogInterface.OnClickListener negativeOnClickListener) {
+        Log.i(TAG, "Displaying data alert for :" + mEngineInfo.name);
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle(android.R.string.dialog_alert_title);
+        builder.setIconAttribute(android.R.attr.alertDialogIcon);
+        builder.setMessage(getContext().getString(
+                R.string.tts_engine_security_warning, mEngineInfo.label));
+        builder.setCancelable(true);
+        builder.setPositiveButton(android.R.string.ok, positiveOnClickListener);
+        builder.setNegativeButton(android.R.string.cancel, negativeOnClickListener);
+
+        AlertDialog dialog = builder.create();
+        dialog.show();
+    }
+
+
+    private void onRadioButtonClicked(final CompoundButton buttonView,
+            boolean isChecked) {
         if (mPreventRadioButtonCallbacks ||
                 (mSharedState.getCurrentChecked() == buttonView)) {
             return;
         }
 
         if (isChecked) {
-            if (mSharedState.getCurrentChecked() != null) {
-                mSharedState.getCurrentChecked().setChecked(false);
+            // Should we alert user? if that's true, delay making engine current one.
+            if (shouldDisplayDataAlert()) {
+                displayDataAlert(new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        makeCurrentEngine(buttonView);
+                    }
+                },new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        // Undo the click.
+                        buttonView.setChecked(false);
+                    }
+                });
+            } else {
+                // Privileged engine, set it current
+                makeCurrentEngine(buttonView);
             }
-            mSharedState.setCurrentChecked(buttonView);
-            mSharedState.setCurrentKey(getKey());
-            callChangeListener(mSharedState.getCurrentKey());
+        } else {
+            mSettingsIcon.setEnabled(false);
         }
+    }
 
-        mSettingsIcon.setEnabled(isChecked);
+    private void makeCurrentEngine(Checkable current) {
+        if (mSharedState.getCurrentChecked() != null) {
+            mSharedState.getCurrentChecked().setChecked(false);
+        }
+        mSharedState.setCurrentChecked(current);
+        mSharedState.setCurrentKey(getKey());
+        callChangeListener(mSharedState.getCurrentKey());
+        mSettingsIcon.setEnabled(true);
     }
 
 
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 0c98819..e02b6ae 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -35,7 +35,6 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
-import com.google.common.collect.Lists;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -202,7 +201,7 @@
                 getEngineName());
 
         ArrayList<Pair<String, String>> entryPairs =
-                Lists.newArrayListWithCapacity(availableLangs.size());
+                new ArrayList<Pair<String, String>>(availableLangs.size());
         for (int i = 0; i < availableLangs.size(); i++) {
             String[] langCountryVariant = availableLangs.get(i).split("-");
             Locale loc = null;
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
new file mode 100644
index 0000000..3d68024
--- /dev/null
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -0,0 +1,1297 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.AppGlobals;
+import android.app.Dialog;
+import android.app.Fragment;
+import android.appwidget.AppWidgetManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.RestrictionEntry;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.ColorFilter;
+import android.graphics.ColorMatrix;
+import android.graphics.ColorMatrixColorFilter;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
+import android.preference.MultiSelectListPreference;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceGroup;
+import android.preference.SwitchPreference;
+import android.provider.ContactsContract.DisplayPhoto;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.inputmethod.InputMethod;
+import android.view.inputmethod.InputMethodInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.ListAdapter;
+import android.widget.ListPopupWindow;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+public class AppRestrictionsFragment extends SettingsPreferenceFragment implements
+        OnPreferenceChangeListener, OnClickListener, OnPreferenceClickListener {
+
+    private static final String TAG = AppRestrictionsFragment.class.getSimpleName();
+
+    private static final boolean DEBUG = false;
+
+    private static final String PKG_PREFIX = "pkg_";
+    private static final String KEY_USER_INFO = "user_info";
+
+    private static final int DIALOG_ID_EDIT_USER_INFO = 1;
+
+    private PackageManager mPackageManager;
+    private UserManager mUserManager;
+    private UserHandle mUser;
+
+    private PreferenceGroup mAppList;
+
+    private static final int MAX_APP_RESTRICTIONS = 100;
+
+    private static final String DELIMITER = ";";
+
+    /** Key for extra passed in from calling fragment for the userId of the user being edited */
+    public static final String EXTRA_USER_ID = "user_id";
+
+    /** Key for extra passed in from calling fragment to indicate if this is a newly created user */
+    public static final String EXTRA_NEW_USER = "new_user";
+
+    private static final String KEY_SAVED_PHOTO = "pending_photo";
+
+    HashMap<String,Boolean> mSelectedPackages = new HashMap<String,Boolean>();
+    private boolean mFirstTime = true;
+    private boolean mNewUser;
+    private boolean mAppListChanged;
+
+    private int mCustomRequestCode;
+    private HashMap<Integer, AppRestrictionsPreference> mCustomRequestMap =
+            new HashMap<Integer,AppRestrictionsPreference>();
+    private View mHeaderView;
+    private ImageView mUserIconView;
+    private TextView mUserNameView;
+
+    private List<SelectableAppInfo> mVisibleApps;
+    private List<ApplicationInfo> mUserApps;
+
+    private Dialog mEditUserInfoDialog;
+
+    private EditUserPhotoController mEditUserPhotoController;
+    private Bitmap mSavedPhoto;
+
+    private BroadcastReceiver mUserBackgrounding = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            // Update the user's app selection right away without waiting for a pause
+            // onPause() might come in too late, causing apps to disappear after broadcasts
+            // have been scheduled during user startup.
+            if (mAppListChanged) {
+                if (DEBUG) Log.d(TAG, "User backgrounding, update app list");
+                updateUserAppList();
+                if (DEBUG) Log.d(TAG, "User backgrounding, done updating app list");
+            }
+        }
+    };
+
+    static class SelectableAppInfo {
+        String packageName;
+        CharSequence appName;
+        CharSequence activityName;
+        Drawable icon;
+        SelectableAppInfo masterEntry;
+
+        @Override
+        public String toString() {
+            return packageName + ": appName=" + appName + "; activityName=" + activityName
+                    + "; icon=" + icon + "; masterEntry=" + masterEntry;
+        }
+    }
+
+    static class AppRestrictionsPreference extends SwitchPreference {
+        private boolean hasSettings;
+        private OnClickListener listener;
+        private ArrayList<RestrictionEntry> restrictions;
+        boolean panelOpen;
+        private boolean immutable;
+        List<Preference> childPreferences = new ArrayList<Preference>();
+        private SelectableAppInfo appInfo;
+        private final ColorFilter grayscaleFilter;
+
+        AppRestrictionsPreference(Context context, OnClickListener listener) {
+            super(context);
+            setLayoutResource(R.layout.preference_app_restrictions);
+            this.listener = listener;
+
+            ColorMatrix colorMatrix = new ColorMatrix();
+            colorMatrix.setSaturation(0f);
+            float[] matrix = colorMatrix.getArray();
+            matrix[18] = 0.5f;
+            grayscaleFilter = new ColorMatrixColorFilter(colorMatrix);
+        }
+
+        private void setSettingsEnabled(boolean enable) {
+            hasSettings = enable;
+        }
+
+        @Override
+        public void setChecked(boolean checked) {
+            if (checked) {
+                getIcon().setColorFilter(null);
+            } else {
+                getIcon().setColorFilter(grayscaleFilter);
+            }
+            super.setChecked(checked);
+        }
+
+        void setRestrictions(ArrayList<RestrictionEntry> restrictions) {
+            this.restrictions = restrictions;
+        }
+
+        void setImmutable(boolean immutable) {
+            this.immutable = immutable;
+        }
+
+        boolean isImmutable() {
+            return immutable;
+        }
+
+        void setSelectableAppInfo(SelectableAppInfo appInfo) {
+            this.appInfo = appInfo;
+        }
+
+        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;
+        }
+
+        @Override
+        protected void onBindView(View view) {
+            super.onBindView(view);
+
+            View appRestrictionsSettings = view.findViewById(R.id.app_restrictions_settings);
+            appRestrictionsSettings.setVisibility(hasSettings ? View.VISIBLE : View.GONE);
+            view.findViewById(R.id.settings_divider).setVisibility(
+                    hasSettings ? View.VISIBLE : View.GONE);
+            appRestrictionsSettings.setOnClickListener(listener);
+            appRestrictionsSettings.setTag(this);
+
+            View appRestrictionsPref = view.findViewById(R.id.app_restrictions_pref);
+            appRestrictionsPref.setOnClickListener(listener);
+            appRestrictionsPref.setTag(this);
+
+            ViewGroup widget = (ViewGroup) view.findViewById(android.R.id.widget_frame);
+            widget.setEnabled(!isImmutable());
+            if (widget.getChildCount() > 0) {
+                final Switch switchView = (Switch) widget.getChildAt(0);
+                switchView.setEnabled(!isImmutable());
+                switchView.setTag(this);
+                switchView.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                    @Override
+                    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                        listener.onClick(switchView);
+                    }
+                });
+            }
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        if (icicle != null) {
+            mUser = new UserHandle(icicle.getInt(EXTRA_USER_ID));
+            mSavedPhoto = (Bitmap) icicle.getParcelable(KEY_SAVED_PHOTO);
+        } else {
+            Bundle args = getArguments();
+
+            if (args.containsKey(EXTRA_USER_ID)) {
+                mUser = new UserHandle(args.getInt(EXTRA_USER_ID));
+            }
+            mNewUser = args.getBoolean(EXTRA_NEW_USER, false);
+        }
+        mPackageManager = getActivity().getPackageManager();
+        mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        addPreferencesFromResource(R.xml.app_restrictions);
+        mAppList = getPreferenceScreen();
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        if (mHeaderView == null) {
+            mHeaderView = LayoutInflater.from(getActivity()).inflate(
+                    R.layout.user_info_header, null);
+            ((ViewGroup) getListView().getParent()).addView(mHeaderView, 0);
+            mHeaderView.setOnClickListener(this);
+            mUserIconView = (ImageView) mHeaderView.findViewById(android.R.id.icon);
+            mUserNameView = (TextView) mHeaderView.findViewById(android.R.id.title);
+            getListView().setFastScrollEnabled(true);
+        }
+        // This is going to bind the preferences.
+        super.onActivityCreated(savedInstanceState);
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(EXTRA_USER_ID, mUser.getIdentifier());
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController != null) {
+            outState.putParcelable(KEY_SAVED_PHOTO,
+                    mEditUserPhotoController.getNewUserPhotoBitmap());
+        }
+    }
+
+    public void onResume() {
+        super.onResume();
+        getActivity().registerReceiver(mUserBackgrounding,
+                new IntentFilter(Intent.ACTION_USER_BACKGROUND));
+        mAppListChanged = false;
+        new AppLoadingTask().execute((Void[]) null);
+
+        UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
+        ((TextView) mHeaderView.findViewById(android.R.id.title)).setText(info.name);
+        ((ImageView) mHeaderView.findViewById(android.R.id.icon)).setImageDrawable(
+                getCircularUserIcon());
+    }
+
+    public void onPause() {
+        super.onPause();
+        mNewUser = false;
+        getActivity().unregisterReceiver(mUserBackgrounding);
+        if (mAppListChanged) {
+            new Thread() {
+                public void run() {
+                    updateUserAppList();
+                }
+            }.start();
+        }
+    }
+
+    private Drawable getCircularUserIcon() {
+        Bitmap userIcon = mUserManager.getUserIcon(mUser.getIdentifier());
+        CircleFramedDrawable circularIcon =
+                CircleFramedDrawable.getInstance(this.getActivity(), userIcon);
+        return circularIcon;
+    }
+
+    private void updateUserAppList() {
+        IPackageManager ipm = IPackageManager.Stub.asInterface(
+                ServiceManager.getService("package"));
+        final int userId = mUser.getIdentifier();
+        if (!mUserManager.getUserInfo(userId).isRestricted()) {
+            Log.e(TAG, "Cannot apply application restrictions on a regular user!");
+            return;
+        }
+        for (Map.Entry<String,Boolean> entry : mSelectedPackages.entrySet()) {
+            String packageName = entry.getKey();
+            if (entry.getValue()) {
+                // Enable selected apps
+                try {
+                    ApplicationInfo info = ipm.getApplicationInfo(packageName, 0, userId);
+                    if (info == null || info.enabled == false) {
+                        ipm.installExistingPackageAsUser(packageName, mUser.getIdentifier());
+                        if (DEBUG) {
+                            Log.d(TAG, "Installing " + packageName);
+                        }
+                    }
+                } catch (RemoteException re) {
+                }
+            } else {
+                // Blacklist all other apps, system or downloaded
+                try {
+                    ApplicationInfo info = ipm.getApplicationInfo(packageName, 0, userId);
+                    if (info != null) {
+                        ipm.deletePackageAsUser(entry.getKey(), null, mUser.getIdentifier(),
+                                PackageManager.DELETE_SYSTEM_APP);
+                        if (DEBUG) {
+                            Log.d(TAG, "Uninstalling " + packageName);
+                        }
+                    }
+                } catch (RemoteException re) {
+                }
+            }
+        }
+    }
+
+    private boolean isSystemPackage(String packageName) {
+        try {
+            final PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0);
+            if (pi.applicationInfo == null) return false;
+            final int flags = pi.applicationInfo.flags;
+            if ((flags & ApplicationInfo.FLAG_SYSTEM) != 0
+                    || (flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+                return true;
+            }
+        } catch (NameNotFoundException nnfe) {
+            // Missing package?
+        }
+        return false;
+    }
+
+    /**
+     * Find all pre-installed input methods that are marked as default
+     * and add them to an exclusion list so that they aren't
+     * presented to the user for toggling.
+     * Don't add non-default ones, as they may include other stuff that we
+     * don't need to auto-include.
+     * @param excludePackages the set of package names to append to
+     */
+    private void addSystemImes(Set<String> excludePackages) {
+        final Context context = getActivity();
+        if (context == null) return;
+        InputMethodManager imm = (InputMethodManager)
+                context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        List<InputMethodInfo> imis = imm.getInputMethodList();
+        for (InputMethodInfo imi : imis) {
+            try {
+                if (imi.isDefault(context) && isSystemPackage(imi.getPackageName())) {
+                    excludePackages.add(imi.getPackageName());
+                }
+            } catch (Resources.NotFoundException rnfe) {
+                // Not default
+            }
+        }
+    }
+
+    /**
+     * Add system apps that match an intent to the list, excluding any packages in the exclude list.
+     * @param visibleApps list of apps to append the new list to
+     * @param intent the intent to match
+     * @param excludePackages the set of package names to be excluded, since they're required
+     */
+    private void addSystemApps(List<SelectableAppInfo> visibleApps, Intent intent,
+            Set<String> excludePackages) {
+        if (getActivity() == null) return;
+        final PackageManager pm = mPackageManager;
+        List<ResolveInfo> launchableApps = pm.queryIntentActivities(intent,
+                PackageManager.GET_DISABLED_COMPONENTS);
+        for (ResolveInfo app : launchableApps) {
+            if (app.activityInfo != null && app.activityInfo.applicationInfo != null) {
+                int flags = app.activityInfo.applicationInfo.flags;
+                if ((flags & ApplicationInfo.FLAG_SYSTEM) != 0
+                        || (flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
+                    // System app
+                    // Skip excluded packages
+                    if (excludePackages.contains(app.activityInfo.packageName)) continue;
+
+                    SelectableAppInfo info = new SelectableAppInfo();
+                    info.packageName = app.activityInfo.packageName;
+                    info.appName = app.activityInfo.applicationInfo.loadLabel(pm);
+                    info.icon = app.activityInfo.loadIcon(pm);
+                    info.activityName = app.activityInfo.loadLabel(pm);
+                    if (info.activityName == null) info.activityName = info.appName;
+
+                    visibleApps.add(info);
+                }
+            }
+        }
+    }
+
+    private class AppLoadingTask extends AsyncTask<Void, Void, Void> {
+
+        @Override
+        protected Void doInBackground(Void... params) {
+            fetchAndMergeApps();
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void result) {
+            populateApps();
+        }
+
+        @Override
+        protected void onPreExecute() {
+        }
+    }
+
+    private void fetchAndMergeApps() {
+        mAppList.setOrderingAsAdded(false);
+        mVisibleApps = new ArrayList<SelectableAppInfo>();
+        final Context context = getActivity();
+        if (context == null) return;
+        final PackageManager pm = mPackageManager;
+        IPackageManager ipm = AppGlobals.getPackageManager();
+
+        final HashSet<String> excludePackages = new HashSet<String>();
+        addSystemImes(excludePackages);
+
+        // Add launchers
+        Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+        launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+        addSystemApps(mVisibleApps, launcherIntent, excludePackages);
+
+        // Add widgets
+        Intent widgetIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE);
+        addSystemApps(mVisibleApps, widgetIntent, excludePackages);
+
+        List<ApplicationInfo> installedApps = pm.getInstalledApplications(0);
+        for (ApplicationInfo app : installedApps) {
+            if ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0
+                    && (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0) {
+                // Downloaded app
+                SelectableAppInfo info = new SelectableAppInfo();
+                info.packageName = app.packageName;
+                info.appName = app.loadLabel(pm);
+                info.activityName = info.appName;
+                info.icon = app.loadIcon(pm);
+                mVisibleApps.add(info);
+            }
+        }
+
+        mUserApps = null;
+        try {
+            mUserApps = ipm.getInstalledApplications(
+                    0, mUser.getIdentifier()).getList();
+        } catch (RemoteException re) {
+        }
+
+        if (mUserApps != null) {
+            for (ApplicationInfo app : mUserApps) {
+                if ((app.flags & ApplicationInfo.FLAG_SYSTEM) == 0
+                        && (app.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0) {
+                    // Downloaded app
+                    SelectableAppInfo info = new SelectableAppInfo();
+                    info.packageName = app.packageName;
+                    info.appName = app.loadLabel(pm);
+                    info.activityName = info.appName;
+                    info.icon = app.loadIcon(pm);
+                    mVisibleApps.add(info);
+                }
+            }
+        }
+        Collections.sort(mVisibleApps, new AppLabelComparator());
+
+        // Remove dupes
+        Set<String> dedupPackageSet = new HashSet<String>();
+        for (int i = mVisibleApps.size() - 1; i >= 0; i--) {
+            SelectableAppInfo info = mVisibleApps.get(i);
+            if (DEBUG) Log.i(TAG, info.toString());
+            String both = info.packageName + "+" + info.activityName;
+            if (!TextUtils.isEmpty(info.packageName)
+                    && !TextUtils.isEmpty(info.activityName)
+                    && dedupPackageSet.contains(both)) {
+                mVisibleApps.remove(i);
+            } else {
+                dedupPackageSet.add(both);
+            }
+        }
+
+        // Establish master/slave relationship for entries that share a package name
+        HashMap<String,SelectableAppInfo> packageMap = new HashMap<String,SelectableAppInfo>();
+        for (SelectableAppInfo info : mVisibleApps) {
+            if (packageMap.containsKey(info.packageName)) {
+                info.masterEntry = packageMap.get(info.packageName);
+            } else {
+                packageMap.put(info.packageName, info);
+            }
+        }
+    }
+
+    private void populateApps() {
+        final Context context = getActivity();
+        if (context == null) return;
+        final PackageManager pm = mPackageManager;
+        IPackageManager ipm = AppGlobals.getPackageManager();
+        mAppList.removeAll();
+        Intent restrictionsIntent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
+        final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(restrictionsIntent, 0);
+        int i = 0;
+        if (mVisibleApps.size() > 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));
+                }
+                p.setKey(PKG_PREFIX + packageName);
+                p.setSettingsEnabled(hasSettings || isSettingsApp);
+                p.setPersistent(false);
+                p.setOnPreferenceChangeListener(this);
+                p.setOnPreferenceClickListener(this);
+                PackageInfo pi = null;
+                try {
+                    pi = pm.getPackageInfo(packageName, 0);
+                } catch (NameNotFoundException re) {
+                    try {
+                        pi = ipm.getPackageInfo(packageName, 0, mUser.getIdentifier());
+                    } catch (RemoteException e) {
+                    }
+                }
+                if (pi != null && pi.requiredForAllUsers) {
+                    p.setChecked(true);
+                    p.setImmutable(true);
+                    // If the app is required and has no restrictions, skip showing it
+                    if (!hasSettings && !isSettingsApp) 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).
+                    if (hasSettings) {
+                        requestRestrictionsForApp(packageName, p);
+                    }
+                } else if (!mNewUser && appInfoListHasPackage(mUserApps, packageName)) {
+                    p.setChecked(true);
+                }
+                if (pi.requiredAccountType != null && pi.restrictedAccountType == null) {
+                    p.setChecked(false);
+                    p.setImmutable(true);
+                    p.setSummary(R.string.app_not_supported_in_limited);
+                }
+                if (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.setSelectableAppInfo(app);
+                mSelectedPackages.put(packageName, p.isChecked());
+                mAppListChanged = true;
+                i++;
+            }
+        }
+        // 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) {
+            mFirstTime = false;
+            updateUserAppList();
+        }
+    }
+
+    private class AppLabelComparator implements Comparator<SelectableAppInfo> {
+
+        @Override
+        public int compare(SelectableAppInfo lhs, SelectableAppInfo rhs) {
+            String lhsLabel = lhs.activityName.toString();
+            String rhsLabel = rhs.activityName.toString();
+            return lhsLabel.toLowerCase().compareTo(rhsLabel.toLowerCase());
+        }
+    }
+
+    private boolean resolveInfoListHasPackage(List<ResolveInfo> receivers, String packageName) {
+        for (ResolveInfo info : receivers) {
+            if (info.activityInfo.packageName.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private boolean appInfoListHasPackage(List<ApplicationInfo> apps, String packageName) {
+        for (ApplicationInfo info : apps) {
+            if (info.packageName.equals(packageName)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void updateAllEntries(String prefKey, boolean checked) {
+        for (int i = 0; i < mAppList.getPreferenceCount(); i++) {
+            Preference pref = mAppList.getPreference(i);
+            if (pref instanceof AppRestrictionsPreference) {
+                if (prefKey.equals(pref.getKey())) {
+                    ((AppRestrictionsPreference) pref).setChecked(checked);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onClick(View v) {
+        if (v == mHeaderView) {
+            showDialog(DIALOG_ID_EDIT_USER_INFO);
+        } else if (v.getTag() instanceof AppRestrictionsPreference) {
+            AppRestrictionsPreference pref = (AppRestrictionsPreference) v.getTag();
+            if (v.getId() == R.id.app_restrictions_settings) {
+                toggleAppPanel(pref);
+            } else if (!pref.isImmutable()) {
+                pref.setChecked(!pref.isChecked());
+                final String packageName = pref.getKey().substring(PKG_PREFIX.length());
+                mSelectedPackages.put(packageName, pref.isChecked());
+                if (pref.isChecked() && pref.hasSettings
+                        && pref.restrictions == null) {
+                    // The restrictions have not been initialized, get and save them
+                    requestRestrictionsForApp(packageName, pref);
+                }
+                mAppListChanged = true;
+                updateAllEntries(pref.getKey(), pref.isChecked());
+            }
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (key != null && key.contains(DELIMITER)) {
+            StringTokenizer st = new StringTokenizer(key, DELIMITER);
+            final String packageName = st.nextToken();
+            final String restrictionKey = st.nextToken();
+            AppRestrictionsPreference appPref = (AppRestrictionsPreference)
+                    mAppList.findPreference(PKG_PREFIX+packageName);
+            ArrayList<RestrictionEntry> restrictions = appPref.getRestrictions();
+            if (restrictions != null) {
+                for (RestrictionEntry entry : restrictions) {
+                    if (entry.getKey().equals(restrictionKey)) {
+                        switch (entry.getType()) {
+                        case RestrictionEntry.TYPE_BOOLEAN:
+                            entry.setSelectedState((Boolean) newValue);
+                            break;
+                        case RestrictionEntry.TYPE_CHOICE:
+                        case RestrictionEntry.TYPE_CHOICE_LEVEL:
+                            ListPreference listPref = (ListPreference) preference;
+                            entry.setSelectedString((String) newValue);
+                            String readable = findInArray(entry.getChoiceEntries(),
+                                    entry.getChoiceValues(), (String) newValue);
+                            listPref.setSummary(readable);
+                            break;
+                        case RestrictionEntry.TYPE_MULTI_SELECT:
+                            MultiSelectListPreference msListPref =
+                                    (MultiSelectListPreference) preference;
+                            Set<String> set = (Set<String>) newValue;
+                            String [] selectedValues = new String[set.size()];
+                            set.toArray(selectedValues);
+                            entry.setAllSelectedStrings(selectedValues);
+                            break;
+                        default:
+                            continue;
+                        }
+                        if (packageName.equals(getActivity().getPackageName())) {
+                            RestrictionUtils.setRestrictions(getActivity(), restrictions, mUser);
+                        } else {
+                            mUserManager.setApplicationRestrictions(packageName,
+                                    RestrictionUtils.restrictionsToBundle(restrictions),
+                                    mUser);
+                        }
+                        break;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    private void toggleAppPanel(AppRestrictionsPreference preference) {
+        if (preference.getKey().startsWith(PKG_PREFIX)) {
+            if (preference.panelOpen) {
+                for (Preference p : preference.childPreferences) {
+                    mAppList.removePreference(p);
+                }
+                preference.childPreferences.clear();
+            } 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);
+                }
+            }
+            preference.panelOpen = !preference.panelOpen;
+        }
+    }
+
+    private void requestRestrictionsForApp(String packageName,
+            AppRestrictionsPreference preference) {
+        Bundle oldEntries =
+                mUserManager.getApplicationRestrictions(packageName, mUser);
+        Intent intent = new Intent(Intent.ACTION_GET_RESTRICTION_ENTRIES);
+        intent.setPackage(packageName);
+        intent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE, oldEntries);
+        intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        getActivity().sendOrderedBroadcast(intent, null,
+                new RestrictionsResultReceiver(packageName, preference),
+                null, Activity.RESULT_OK, null, null);
+    }
+
+    class RestrictionsResultReceiver extends BroadcastReceiver {
+
+        private static final String CUSTOM_RESTRICTIONS_INTENT = Intent.EXTRA_RESTRICTIONS_INTENT;
+        String packageName;
+        AppRestrictionsPreference preference;
+
+        RestrictionsResultReceiver(String packageName, AppRestrictionsPreference preference) {
+            super();
+            this.packageName = packageName;
+            this.preference = preference;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Bundle results = getResultExtras(true);
+            final ArrayList<RestrictionEntry> restrictions = results.getParcelableArrayList(
+                    Intent.EXTRA_RESTRICTIONS_LIST);
+            Intent restrictionsIntent = (Intent) results.getParcelable(CUSTOM_RESTRICTIONS_INTENT);
+            if (restrictions != null && restrictionsIntent == null) {
+                onRestrictionsReceived(preference, packageName, restrictions);
+                mUserManager.setApplicationRestrictions(packageName,
+                        RestrictionUtils.restrictionsToBundle(restrictions), mUser);
+            } else if (restrictionsIntent != null) {
+                final Intent customIntent = restrictionsIntent;
+                if (restrictions != null) {
+                    customIntent.putExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE,
+                            RestrictionUtils.restrictionsToBundle(restrictions));
+                }
+                Preference p = new Preference(context);
+                p.setTitle(R.string.app_restrictions_custom_label);
+                p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
+                    public boolean onPreferenceClick(Preference preference) {
+                        int requestCode = generateCustomActivityRequestCode(
+                                RestrictionsResultReceiver.this.preference);
+                        AppRestrictionsFragment.this.startActivityForResult(
+                                customIntent, requestCode);
+                        return false;
+                    }
+                });
+                p.setPersistent(false);
+                p.setOrder(preference.getOrder() + 1);
+                preference.childPreferences.add(p);
+                mAppList.addPreference(p);
+                preference.setRestrictions(restrictions);
+            }
+        }
+    }
+
+    private void onRestrictionsReceived(AppRestrictionsPreference preference, String packageName,
+            ArrayList<RestrictionEntry> restrictions) {
+        // Non-custom-activity case - expand the restrictions in-place
+        final Context context = preference.getContext();
+        int count = 1;
+        for (RestrictionEntry entry : restrictions) {
+            Preference p = null;
+            switch (entry.getType()) {
+            case RestrictionEntry.TYPE_BOOLEAN:
+                p = new CheckBoxPreference(context);
+                p.setTitle(entry.getTitle());
+                p.setSummary(entry.getDescription());
+                ((CheckBoxPreference)p).setChecked(entry.getSelectedState());
+                break;
+            case RestrictionEntry.TYPE_CHOICE:
+            case RestrictionEntry.TYPE_CHOICE_LEVEL:
+                p = new ListPreference(context);
+                p.setTitle(entry.getTitle());
+                String value = entry.getSelectedString();
+                if (value == null) {
+                    value = entry.getDescription();
+                }
+                p.setSummary(findInArray(entry.getChoiceEntries(), entry.getChoiceValues(),
+                        value));
+                ((ListPreference)p).setEntryValues(entry.getChoiceValues());
+                ((ListPreference)p).setEntries(entry.getChoiceEntries());
+                ((ListPreference)p).setValue(value);
+                ((ListPreference)p).setDialogTitle(entry.getTitle());
+                break;
+            case RestrictionEntry.TYPE_MULTI_SELECT:
+                p = new MultiSelectListPreference(context);
+                p.setTitle(entry.getTitle());
+                ((MultiSelectListPreference)p).setEntryValues(entry.getChoiceValues());
+                ((MultiSelectListPreference)p).setEntries(entry.getChoiceEntries());
+                HashSet<String> set = new HashSet<String>();
+                for (String s : entry.getAllSelectedStrings()) {
+                    set.add(s);
+                }
+                ((MultiSelectListPreference)p).setValues(set);
+                ((MultiSelectListPreference)p).setDialogTitle(entry.getTitle());
+                break;
+            case RestrictionEntry.TYPE_NULL:
+            default:
+            }
+            if (p != null) {
+                p.setPersistent(false);
+                p.setOrder(preference.getOrder() + count);
+                // Store the restrictions key string as a key for the preference
+                p.setKey(preference.getKey().substring(PKG_PREFIX.length()) + DELIMITER
+                        + entry.getKey());
+                mAppList.addPreference(p);
+                p.setOnPreferenceChangeListener(AppRestrictionsFragment.this);
+                preference.childPreferences.add(p);
+                count++;
+            }
+        }
+        preference.setRestrictions(restrictions);
+        if (count == 1 // No visible restrictions
+                && preference.isImmutable()
+                && preference.isChecked()) {
+            // Special case of required app with no visible restrictions. Remove it
+            mAppList.removePreference(preference);
+        }
+    }
+
+    /**
+     * Generates a request code that is stored in a map to retrieve the associated
+     * AppRestrictionsPreference.
+     * @param preference
+     * @return
+     */
+    private int generateCustomActivityRequestCode(AppRestrictionsPreference preference) {
+        mCustomRequestCode++;
+        mCustomRequestMap.put(mCustomRequestCode, preference);
+        return mCustomRequestCode;
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
+                && mEditUserPhotoController.onActivityResult(requestCode, resultCode, data)) {
+            return;
+        }
+
+        AppRestrictionsPreference pref = mCustomRequestMap.get(requestCode);
+        if (pref == null) {
+            Log.w(TAG, "Unknown requestCode " + requestCode);
+            return;
+        }
+
+        if (resultCode == Activity.RESULT_OK) {
+            String packageName = pref.getKey().substring(PKG_PREFIX.length());
+            ArrayList<RestrictionEntry> list =
+                    data.getParcelableArrayListExtra(Intent.EXTRA_RESTRICTIONS_LIST);
+            Bundle bundle = data.getBundleExtra(Intent.EXTRA_RESTRICTIONS_BUNDLE);
+            if (list != null) {
+                // If there's a valid result, persist it to the user manager.
+                pref.setRestrictions(list);
+                mUserManager.setApplicationRestrictions(packageName,
+                        RestrictionUtils.restrictionsToBundle(list), mUser);
+            } else if (bundle != null) {
+                // If there's a valid result, persist it to the user manager.
+                mUserManager.setApplicationRestrictions(packageName, bundle, mUser);
+            }
+            toggleAppPanel(pref);
+        }
+        // Remove request from the map
+        mCustomRequestMap.remove(requestCode);
+    }
+
+    private String findInArray(String[] choiceEntries, String[] choiceValues,
+            String selectedString) {
+        for (int i = 0; i < choiceValues.length; i++) {
+            if (choiceValues[i].equals(selectedString)) {
+                return choiceEntries[i];
+            }
+        }
+        return selectedString;
+    }
+
+    @Override
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference.getKey().startsWith(PKG_PREFIX)) {
+            AppRestrictionsPreference arp = (AppRestrictionsPreference) preference;
+            if (!arp.isImmutable()) {
+                arp.setChecked(!arp.isChecked());
+                mSelectedPackages.put(arp.getKey().substring(PKG_PREFIX.length()), arp.isChecked());
+                updateAllEntries(arp.getKey(), arp.isChecked());
+                mAppListChanged = true;
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        if (dialogId == DIALOG_ID_EDIT_USER_INFO) {
+            if (mEditUserInfoDialog != null) {
+                return mEditUserInfoDialog;
+            }
+
+            LayoutInflater inflater = getActivity().getLayoutInflater();
+            View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
+
+            UserInfo info = mUserManager.getUserInfo(mUser.getIdentifier());
+
+            final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
+            userNameView.setText(info.name);
+
+            final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
+            Drawable drawable = null;
+            if (mSavedPhoto != null) {
+                drawable = CircleFramedDrawable.getInstance(getActivity(), mSavedPhoto);
+            } else {
+                drawable = mUserIconView.getDrawable();
+                if (drawable == null) {
+                    drawable = getCircularUserIcon();
+                }
+            }
+            userPhotoView.setImageDrawable(drawable);
+
+            mEditUserPhotoController = new EditUserPhotoController(this, userPhotoView,
+                    mSavedPhoto, drawable);
+
+            mEditUserInfoDialog = new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.profile_info_settings_title)
+                .setIconAttribute(R.drawable.ic_settings_multiuser)
+                .setView(content)
+                .setCancelable(true)
+                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (which == DialogInterface.BUTTON_POSITIVE) {
+                            // Update the name if changed.
+                            CharSequence userName = userNameView.getText();
+                            if (!TextUtils.isEmpty(userName)) {
+                                CharSequence oldUserName = mUserNameView.getText();
+                                if (oldUserName == null
+                                        || !userName.toString().equals(oldUserName.toString())) {
+                                    ((TextView) mHeaderView.findViewById(android.R.id.title))
+                                            .setText(userName.toString());
+                                    mUserManager.setUserName(mUser.getIdentifier(),
+                                            userName.toString());
+                                }
+                            }
+                            // Update the photo if changed.
+                            Drawable drawable = mEditUserPhotoController.getNewUserPhotoDrawable();
+                            Bitmap bitmap = mEditUserPhotoController.getNewUserPhotoBitmap();
+                            if (drawable != null && bitmap != null
+                                    && !drawable.equals(mUserIconView.getDrawable())) {
+                                mUserIconView.setImageDrawable(drawable);
+                                new AsyncTask<Void, Void, Void>() {
+                                    @Override
+                                    protected Void doInBackground(Void... params) {
+                                        mUserManager.setUserIcon(mUser.getIdentifier(),
+                                                mEditUserPhotoController.getNewUserPhotoBitmap());
+                                        return null;
+                                    }
+                                }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+                            }
+                            removeDialog(DIALOG_ID_EDIT_USER_INFO);
+                        }
+                        clearEditUserInfoDialog();
+                    }
+                })
+                .setNegativeButton(android.R.string.cancel,  new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        clearEditUserInfoDialog();
+                    }
+                 })
+                .create();
+
+            // Make sure the IME is up.
+            mEditUserInfoDialog.getWindow().setSoftInputMode(
+                    WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
+
+            return mEditUserInfoDialog;
+        }
+
+        return null;
+    }
+
+    private void clearEditUserInfoDialog() {
+        mEditUserInfoDialog = null;
+        mSavedPhoto = null;
+    }
+
+    private static class EditUserPhotoController {
+        private static final int POPUP_LIST_ITEM_ID_CHOOSE_PHOTO = 1;
+        private static final int POPUP_LIST_ITEM_ID_TAKE_PHOTO = 2;
+
+        // It seems that this class generates custom request codes and they may
+        // collide with ours, these values are very unlikely to have a conflict.
+        private static final int REQUEST_CODE_CHOOSE_PHOTO = Integer.MAX_VALUE;
+        private static final int REQUEST_CODE_TAKE_PHOTO = Integer.MAX_VALUE - 1;
+        private static final int REQUEST_CODE_CROP_PHOTO = Integer.MAX_VALUE - 2;
+
+        private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
+        private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
+
+        private final int mPhotoSize;
+
+        private final Context mContext;
+        private final Fragment mFragment;
+        private final ImageView mImageView;
+
+        private final Uri mCropPictureUri;
+        private final Uri mTakePictureUri;
+
+        private Bitmap mNewUserPhotoBitmap;
+        private Drawable mNewUserPhotoDrawable;
+
+        public EditUserPhotoController(Fragment fragment, ImageView view,
+                Bitmap bitmap, Drawable drawable) {
+            mContext = view.getContext();
+            mFragment = fragment;
+            mImageView = view;
+            mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME);
+            mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME);
+            mPhotoSize = getPhotoSize(mContext);
+            mImageView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    showUpdatePhotoPopup();
+                }
+            });
+            mNewUserPhotoBitmap = bitmap;
+            mNewUserPhotoDrawable = drawable;
+        }
+
+        public boolean onActivityResult(int requestCode, int resultCode, final Intent data) {
+            if (resultCode != Activity.RESULT_OK) {
+                return false;
+            }
+            switch (requestCode) {
+                case REQUEST_CODE_CHOOSE_PHOTO:
+                case REQUEST_CODE_CROP_PHOTO: {
+                    new AsyncTask<Void, Void, Bitmap>() {
+                        @Override
+                        protected Bitmap doInBackground(Void... params) {
+                            return BitmapFactory.decodeFile(mCropPictureUri.getPath());
+                        }
+                        @Override
+                        protected void onPostExecute(Bitmap bitmap) {
+                            mNewUserPhotoBitmap = bitmap;
+                            mNewUserPhotoDrawable = CircleFramedDrawable
+                                    .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
+                            mImageView.setImageDrawable(mNewUserPhotoDrawable);
+                            // Delete the files - not needed anymore.
+                            new File(mCropPictureUri.getPath()).delete();
+                            new File(mTakePictureUri.getPath()).delete();
+                        }
+                    }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
+                } return true;
+                case REQUEST_CODE_TAKE_PHOTO: {
+                    cropPhoto();
+                } break;
+            }
+            return false;
+        }
+
+        public Bitmap getNewUserPhotoBitmap() {
+            return mNewUserPhotoBitmap;
+        }
+
+        public Drawable getNewUserPhotoDrawable() {
+            return mNewUserPhotoDrawable;
+        }
+
+        private void showUpdatePhotoPopup() {
+            final boolean canTakePhoto = canTakePhoto();
+            final boolean canChoosePhoto = canChoosePhoto();
+
+            if (!canTakePhoto && !canChoosePhoto) {
+                return;
+            }
+
+            Context context = mImageView.getContext();
+            final List<AdapterItem> items = new ArrayList<AdapterItem>();
+
+            if (canTakePhoto()) {
+                String title = mImageView.getContext().getString( R.string.user_image_take_photo);
+                AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_TAKE_PHOTO);
+                items.add(item);
+            }
+
+            if (canChoosePhoto) {
+                String title = context.getString(R.string.user_image_choose_photo);
+                AdapterItem item = new AdapterItem(title, POPUP_LIST_ITEM_ID_CHOOSE_PHOTO);
+                items.add(item);
+            }
+
+            final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
+
+            listPopupWindow.setAnchorView(mImageView);
+            listPopupWindow.setModal(true);
+            listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
+
+            ListAdapter adapter = new ArrayAdapter<AdapterItem>(context,
+                    R.layout.edit_user_photo_popup_item, items);
+            listPopupWindow.setAdapter(adapter);
+
+            final int width = Math.max(mImageView.getWidth(), context.getResources()
+                    .getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
+            listPopupWindow.setWidth(width);
+
+            listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+                @Override
+                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                    AdapterItem item = items.get(position);
+                    switch (item.id) {
+                        case POPUP_LIST_ITEM_ID_CHOOSE_PHOTO: {
+                            choosePhoto();
+                            listPopupWindow.dismiss();
+                        } break;
+                        case POPUP_LIST_ITEM_ID_TAKE_PHOTO: {
+                            takePhoto();
+                            listPopupWindow.dismiss();
+                        } break;
+                    }
+                }
+            });
+
+            listPopupWindow.show();
+        }
+
+        private boolean canTakePhoto() {
+            return mImageView.getContext().getPackageManager().queryIntentActivities(
+                    new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
+                    PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
+        }
+
+        private boolean canChoosePhoto() {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
+            intent.setType("image/*");
+            return mImageView.getContext().getPackageManager().queryIntentActivities(
+                    intent, 0).size() > 0;
+        }
+
+        private void takePhoto() {
+            Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, mTakePictureUri);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
+        }
+
+        private void choosePhoto() {
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
+            intent.setType("image/*");
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, mCropPictureUri);
+            appendCropExtras(intent);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
+        }
+
+        private void cropPhoto() {
+            Intent intent = new Intent("com.android.camera.action.CROP");
+            intent.setDataAndType(mTakePictureUri, "image/*");
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, mCropPictureUri);
+            appendCropExtras(intent);
+            mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
+        }
+
+        private void appendCropExtras(Intent intent) {
+            intent.putExtra("crop", "true");
+            intent.putExtra("scale", true);
+            intent.putExtra("scaleUpIfNeeded", true);
+            intent.putExtra("aspectX", 1);
+            intent.putExtra("aspectY", 1);
+            intent.putExtra("outputX", mPhotoSize);
+            intent.putExtra("outputY", mPhotoSize);
+        }
+
+        private static int getPhotoSize(Context context) {
+            Cursor cursor = context.getContentResolver().query(
+                    DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
+                    new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
+            try {
+                cursor.moveToFirst();
+                return cursor.getInt(0);
+            } finally {
+                cursor.close();
+            }
+        }
+
+        private static Uri createTempImageUri(Context context, String fileName) {
+            File folder = context.getExternalCacheDir();
+            folder.mkdirs();
+            File fullPath = new File(folder, fileName);
+            fullPath.delete();
+            return Uri.fromFile(fullPath.getAbsoluteFile());
+        }
+
+        private static final class AdapterItem {
+            final String title;
+            final int id;
+
+            public AdapterItem(String title, int id) {
+                this.title = title;
+                this.id = id;
+            }
+
+            @Override
+            public String toString() {
+                return title;
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/users/CircleFramedDrawable.java b/src/com/android/settings/users/CircleFramedDrawable.java
new file mode 100644
index 0000000..671cfbe
--- /dev/null
+++ b/src/com/android/settings/users/CircleFramedDrawable.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorFilter;
+import android.graphics.Paint;
+import android.graphics.Path;
+import android.graphics.PixelFormat;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
+import android.graphics.RectF;
+import android.graphics.drawable.Drawable;
+
+import com.android.settings.R;
+
+/**
+ * Converts the user avatar icon to a circularly clipped one.
+ * TODO: Move this to an internal framework class and share with the one in Keyguard.
+ */
+class CircleFramedDrawable extends Drawable {
+
+    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);
+        return instance;
+    }
+
+    public CircleFramedDrawable(Bitmap icon, int size,
+            int frameColor, float strokeWidth,
+            int frameShadowColor, float shadowRadius,
+            int highlightColor) {
+        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);
+
+        final int width = icon.getWidth();
+        final int height = icon.getHeight();
+        final int square = Math.min(width, height);
+
+        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);
+
+        canvas.drawColor(0, PorterDuff.Mode.CLEAR);
+
+        // opaque circle matte
+        mPaint = new Paint();
+        mPaint.setAntiAlias(true);
+        mPaint.setColor(Color.BLACK);
+        mPaint.setStyle(Paint.Style.FILL);
+        canvas.drawPath(fillPath, mPaint);
+
+        // mask in the icon where the bitmap is opaque
+        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP));
+        canvas.drawBitmap(icon, cropRect, circleRect, mPaint);
+
+        // prepare paint for frame drawing
+        mPaint.setXfermode(null);
+
+        mScale = 1f;
+
+        mSrcRect = new Rect(0, 0, mSize, mSize);
+        mDstRect = new RectF(0, 0, mSize, mSize);
+        mFrameRect = new RectF(mDstRect);
+        mFramePath = new Path();
+    }
+
+    @Override
+    public void draw(Canvas canvas) {
+        final float inside = mScale * mSize;
+        final float pad = (mSize - inside) / 2f;
+
+        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) {
+        mScale = scale;
+    }
+
+    public float getScale() {
+        return mScale;
+    }
+
+    public void setPressed(boolean pressed) {
+        mPressed = pressed;
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.TRANSLUCENT;
+    }
+
+    @Override
+    public void setAlpha(int alpha) {
+    }
+
+    @Override
+    public void setColorFilter(ColorFilter cf) {
+    }
+    
+    @Override
+    public int getIntrinsicWidth() {
+        return mSize;
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        return mSize;
+    }
+}
diff --git a/src/com/android/settings/users/RestrictionUtils.java b/src/com/android/settings/users/RestrictionUtils.java
new file mode 100644
index 0000000..3ee6d51
--- /dev/null
+++ b/src/com/android/settings/users/RestrictionUtils.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.users;
+
+import android.content.Context;
+import android.content.RestrictionEntry;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings.Secure;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+
+public class RestrictionUtils {
+
+    public static final String [] sRestrictionKeys = {
+//        UserManager.DISALLOW_CONFIG_WIFI,
+//        UserManager.DISALLOW_CONFIG_BLUETOOTH,
+        UserManager.DISALLOW_SHARE_LOCATION,
+//        UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES
+    };
+
+    public static final int [] sRestrictionTitles = {
+//        R.string.restriction_wifi_config_title,
+//        R.string.restriction_bluetooth_config_title,
+        R.string.restriction_location_enable_title,
+//        R.string.install_applications
+    };
+
+    public static final int [] sRestrictionDescriptions = {
+//        R.string.restriction_wifi_config_summary,
+//        R.string.restriction_bluetooth_config_summary,
+        R.string.restriction_location_enable_summary,
+//        R.string.install_unknown_applications
+    };
+
+    /**
+     * Returns the current user restrictions in the form of application
+     * restriction entries.
+     * @return list of RestrictionEntry objects with user-visible text.
+     */
+    public static ArrayList<RestrictionEntry> getRestrictions(Context context, UserHandle user) {
+        Resources res = context.getResources();
+        ArrayList<RestrictionEntry> entries = new ArrayList<RestrictionEntry>();
+        UserManager um = UserManager.get(context);
+        Bundle userRestrictions = um.getUserRestrictions(user);
+
+        for (int i = 0; i < sRestrictionKeys.length; i++) {
+            RestrictionEntry entry = new RestrictionEntry(
+                    sRestrictionKeys[i],
+                    !userRestrictions.getBoolean(sRestrictionKeys[i], false));
+            entry.setTitle(res.getString(sRestrictionTitles[i]));
+            entry.setDescription(res.getString(sRestrictionDescriptions[i]));
+            entry.setType(RestrictionEntry.TYPE_BOOLEAN);
+            entries.add(entry);
+        }
+
+        return entries;
+    }
+
+    public static void setRestrictions(Context context, ArrayList<RestrictionEntry> entries,
+            UserHandle user) {
+        UserManager um = UserManager.get(context);
+        Bundle userRestrictions = um.getUserRestrictions(user);
+
+        for (RestrictionEntry entry : entries) {
+            userRestrictions.putBoolean(entry.getKey(), !entry.getSelectedState());
+            if (entry.getKey().equals(UserManager.DISALLOW_SHARE_LOCATION)
+                    && !entry.getSelectedState()) {
+                Secure.putStringForUser(context.getContentResolver(),
+                        Secure.LOCATION_PROVIDERS_ALLOWED, "", user.getIdentifier());
+            }
+        }
+        um.setUserRestrictions(userRestrictions, user);
+    }
+
+    public static Bundle restrictionsToBundle(ArrayList<RestrictionEntry> entries) {
+        final Bundle bundle = new Bundle();
+        for (RestrictionEntry entry : entries) {
+            if (entry.getType() == RestrictionEntry.TYPE_BOOLEAN) {
+                bundle.putBoolean(entry.getKey(), entry.getSelectedState());
+            } else if (entry.getType() == RestrictionEntry.TYPE_MULTI_SELECT) {
+                bundle.putStringArray(entry.getKey(), entry.getAllSelectedStrings());
+            } else {
+                bundle.putString(entry.getKey(), entry.getSelectedString());
+            }
+        }
+        return bundle;
+    }
+}
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 23cca73..9f53aa5 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -20,6 +20,7 @@
 import com.android.settings.R;
 
 import android.content.Context;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
 import android.util.AttributeSet;
@@ -31,34 +32,62 @@
     public static final int USERID_UNKNOWN = -10;
 
     private OnClickListener mDeleteClickListener;
+    private OnClickListener mSettingsClickListener;
     private int mSerialNumber = -1;
     private int mUserId = USERID_UNKNOWN;
+    private boolean mRestricted;
+    private boolean mSelf;
+    static final int SETTINGS_ID = R.id.manage_user;
+    static final int DELETE_ID = R.id.trash_user;
 
     public UserPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, USERID_UNKNOWN, false, null);
+        this(context, attrs, USERID_UNKNOWN, null, null);
     }
 
-    UserPreference(Context context, AttributeSet attrs, int userId, boolean showDelete,
+    UserPreference(Context context, AttributeSet attrs, int userId,
+            OnClickListener settingsListener,
             OnClickListener deleteListener) {
         super(context, attrs);
-        if (showDelete) {
+        if (deleteListener != null || settingsListener != null) {
             setWidgetLayoutResource(R.layout.preference_user_delete_widget);
-            mDeleteClickListener = deleteListener;
         }
+        mDeleteClickListener = deleteListener;
+        mSettingsClickListener = settingsListener;
         mUserId = userId;
     }
 
     @Override
     protected void onBindView(View view) {
+        View deleteDividerView = view.findViewById(R.id.divider_delete);
+        View manageDividerView = view.findViewById(R.id.divider_manage);
         View deleteView = view.findViewById(R.id.trash_user);
         if (deleteView != null) {
-            deleteView.setOnClickListener(mDeleteClickListener);
-            deleteView.setTag(this);
+            if (mDeleteClickListener != null) {
+                deleteView.setOnClickListener(mDeleteClickListener);
+                deleteView.setTag(this);
+            } else {
+                deleteView.setVisibility(View.GONE);
+                deleteDividerView.setVisibility(View.GONE);
+            }
+        }
+        View manageView = view.findViewById(R.id.manage_user);
+        if (manageView != null) {
+            if (mSettingsClickListener != null) {
+                manageView.setOnClickListener(mSettingsClickListener);
+                manageView.setTag(this);
+                if (mDeleteClickListener != null) {
+                    manageDividerView.setVisibility(View.GONE);
+                }
+            } else {
+                manageView.setVisibility(View.GONE);
+                manageDividerView.setVisibility(View.GONE);
+            }
         }
         super.onBindView(view);
     }
 
-    public int getSerialNumber() {
+    private int getSerialNumber() {
+        if (mUserId == UserHandle.myUserId()) return Integer.MIN_VALUE;
         if (mSerialNumber < 0) {
             // If the userId is unknown
             if (mUserId == USERID_UNKNOWN) return Integer.MAX_VALUE;
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index dbaaf37..a19158f 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,9 +16,13 @@
 
 package com.android.settings.users;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
 import android.app.ActivityManagerNative;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.admin.DevicePolicyManager;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -29,7 +33,6 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -39,12 +42,12 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
-import android.preference.PreferenceScreen;
+import android.preference.PreferenceActivity;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.Contacts;
-import android.text.InputType;
+import android.provider.Settings.Secure;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
@@ -52,15 +55,21 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.SimpleAdapter;
 
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.ChooseLockGeneric;
+import com.android.settings.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.OwnerInfoSettings;
 import com.android.settings.R;
 import com.android.settings.SelectableEditTextPreference;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
-import com.android.settings.SettingsPreferenceFragment.SettingsDialogFragment;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class UserSettings extends SettingsPreferenceFragment
         implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener,
@@ -73,25 +82,33 @@
     /** UserId of the user that was just added */
     private static final String SAVE_ADDING_USER = "adding_user";
 
-    private static final String KEY_USER_NICKNAME = "user_nickname";
     private static final String KEY_USER_LIST = "user_list";
     private static final String KEY_USER_ME = "user_me";
+    private static final String KEY_ADD_USER = "user_add";
 
-    private static final int MENU_ADD_USER = Menu.FIRST;
-    private static final int MENU_REMOVE_USER = Menu.FIRST+1;
+    private static final int MENU_REMOVE_USER = Menu.FIRST;
 
     private static final int DIALOG_CONFIRM_REMOVE = 1;
     private static final int DIALOG_ADD_USER = 2;
     private static final int DIALOG_SETUP_USER = 3;
-    private static final int DIALOG_USER_CANNOT_MANAGE = 4;
+    private static final int DIALOG_SETUP_PROFILE = 4;
+    private static final int DIALOG_USER_CANNOT_MANAGE = 5;
+    private static final int DIALOG_CHOOSE_USER_TYPE = 6;
+    private static final int DIALOG_NEED_LOCKSCREEN = 7;
 
     private static final int MESSAGE_UPDATE_LIST = 1;
     private static final int MESSAGE_SETUP_USER = 2;
+    private static final int MESSAGE_CONFIG_USER = 3;
+
+    private static final int USER_TYPE_USER = 1;
+    private static final int USER_TYPE_RESTRICTED_PROFILE = 2;
+
+    private static final int REQUEST_CHOOSE_LOCK = 10;
 
     private static final String KEY_ADD_USER_LONG_MESSAGE_DISPLAYED =
             "key_add_user_long_message_displayed";
 
-    private static final int[] USER_DRAWABLES = {
+    static final int[] USER_DRAWABLES = {
         R.drawable.avatar_default_1,
         R.drawable.avatar_default_2,
         R.drawable.avatar_default_3,
@@ -102,9 +119,13 @@
         R.drawable.avatar_default_8
     };
 
+    private static final String KEY_TITLE = "title";
+    private static final String KEY_SUMMARY = "summary";
+
     private PreferenceGroup mUserListCategory;
     private Preference mMePreference;
     private SelectableEditTextPreference mNicknamePreference;
+    private Preference mAddUser;
     private int mRemovingUserId = -1;
     private int mAddedUserId = 0;
     private boolean mAddingUser;
@@ -112,7 +133,7 @@
 
     private final Object mUserLock = new Object();
     private UserManager mUserManager;
-    private SparseArray<Drawable> mUserIcons = new SparseArray<Drawable>();
+    private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
     private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
 
 
@@ -126,6 +147,9 @@
             case MESSAGE_SETUP_USER:
                 onUserCreated(msg.arg1);
                 break;
+            case MESSAGE_CONFIG_USER:
+                onManageUserClicked(msg.arg1, true);
+                break;
             }
         }
     };
@@ -161,21 +185,18 @@
         mUserManager = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
         addPreferencesFromResource(R.xml.user_settings);
         mUserListCategory = (PreferenceGroup) findPreference(KEY_USER_LIST);
-        mMePreference = (Preference) findPreference(KEY_USER_ME);
+        mMePreference = new UserPreference(getActivity(), null, UserHandle.myUserId(),
+                mUserManager.isLinkedUser() ? null : this, null);
+        mMePreference.setKey(KEY_USER_ME);
         mMePreference.setOnPreferenceClickListener(this);
-        if (!mIsOwner) {
-            mMePreference.setSummary(null);
+        if (mIsOwner) {
+            mMePreference.setSummary(R.string.user_owner);
         }
-        Preference ownerInfo = findPreference("user_owner_info");
-        if (ownerInfo != null && !mIsOwner) {
-            ownerInfo.setTitle(R.string.user_info_settings_title);
+        mAddUser = findPreference(KEY_ADD_USER);
+        mAddUser.setOnPreferenceClickListener(this);
+        if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2) {
+            removePreference(KEY_ADD_USER);
         }
-        mNicknamePreference = (SelectableEditTextPreference) findPreference(KEY_USER_NICKNAME);
-        mNicknamePreference.setOnPreferenceChangeListener(this);
-        mNicknamePreference.getEditText().setInputType(
-                InputType.TYPE_TEXT_VARIATION_NORMAL | InputType.TYPE_TEXT_FLAG_CAP_WORDS);
-        mNicknamePreference.setInitialSelectionMode(
-                SelectableEditTextPreference.SELECTION_SELECT_ALL);
         loadProfile();
         setHasOptionsMenu(true);
         IntentFilter filter = new IntentFilter(Intent.ACTION_USER_REMOVED);
@@ -207,13 +228,8 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (mIsOwner) {
-            if (UserManager.getMaxSupportedUsers() > mUserManager.getUsers(false).size()) {
-                MenuItem addUserItem = menu.add(0, MENU_ADD_USER, 0, R.string.user_add_user_menu);
-                addUserItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
-                        | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-            }
-        } else {
+        UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        if (!mIsOwner && !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) {
             String nickname = mUserManager.getUserName();
             MenuItem removeThisUser = menu.add(0, MENU_REMOVE_USER, 0,
                     getResources().getString(R.string.user_remove_user_menu, nickname));
@@ -225,10 +241,7 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         final int itemId = item.getItemId();
-        if (itemId == MENU_ADD_USER) {
-            onAddUserClicked();
-            return true;
-        } else if (itemId == MENU_REMOVE_USER) {
+        if (itemId == MENU_REMOVE_USER) {
             onRemoveUserClicked(UserHandle.myUserId());
             return true;
         } else {
@@ -251,26 +264,65 @@
                     assignProfilePhoto(user);
                 }
                 String profileName = getProfileName();
+                if (profileName == null) {
+                    profileName = user.name;
+                }
                 return profileName;
             }
         }.execute();
     }
 
     private void finishLoadProfile(String profileName) {
-        mMePreference.setTitle(profileName);
+        if (getActivity() == null) return;
+        mMePreference.setTitle(getString(R.string.user_you, profileName));
         int myUserId = UserHandle.myUserId();
         Bitmap b = mUserManager.getUserIcon(myUserId);
         if (b != null) {
-            Drawable d = new BitmapDrawable(b);
-            mMePreference.setIcon(d);
-            mUserIcons.put(myUserId, d);
+            mMePreference.setIcon(encircle(b));
+            mUserIcons.put(myUserId, b);
         }
     }
 
-    private void onAddUserClicked() {
+    private boolean hasLockscreenSecurity() {
+        LockPatternUtils lpu = new LockPatternUtils(getActivity());
+        return lpu.isLockPasswordEnabled() || lpu.isLockPatternEnabled();
+    }
+
+    private void launchChooseLockscreen() {
+        Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+        chooseLockIntent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        startActivityForResult(chooseLockIntent, REQUEST_CHOOSE_LOCK);
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_CHOOSE_LOCK) {
+            if (resultCode != Activity.RESULT_CANCELED && hasLockscreenSecurity()) {
+                addUserNow(USER_TYPE_RESTRICTED_PROFILE);
+            } else {
+                showDialog(DIALOG_NEED_LOCKSCREEN);
+            }
+        }
+    }
+
+    private void onAddUserClicked(int userType) {
         synchronized (mUserLock) {
             if (mRemovingUserId == -1 && !mAddingUser) {
-                showDialog(DIALOG_ADD_USER);
+                switch (userType) {
+                case USER_TYPE_USER:
+                    showDialog(DIALOG_ADD_USER);
+                    break;
+                case USER_TYPE_RESTRICTED_PROFILE:
+                    if (hasLockscreenSecurity()) {
+                        addUserNow(USER_TYPE_RESTRICTED_PROFILE);
+                    } else {
+                        showDialog(DIALOG_NEED_LOCKSCREEN);
+                    }
+                    break;
+                }
             }
         }
     }
@@ -284,9 +336,72 @@
         }
     }
 
+    private UserInfo createLimitedUser() {
+        UserInfo newUserInfo = mUserManager.createUser(
+                getResources().getString(R.string.user_new_profile_name),
+                UserInfo.FLAG_RESTRICTED);
+        int userId = newUserInfo.id;
+        UserHandle user = new UserHandle(userId);
+        mUserManager.setUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS, true, user);
+        mUserManager.setUserRestriction(UserManager.DISALLOW_SHARE_LOCATION, true, user);
+        Secure.putStringForUser(getContentResolver(),
+                Secure.LOCATION_PROVIDERS_ALLOWED, "", userId);
+        Bitmap bitmap = BitmapFactory.decodeResource(getResources(),
+                UserSettings.USER_DRAWABLES[
+                        userId % UserSettings.USER_DRAWABLES.length]);
+        mUserManager.setUserIcon(userId, bitmap);
+        // Add shared accounts
+        AccountManager am = AccountManager.get(getActivity());
+        Account [] accounts = am.getAccounts();
+        if (accounts != null) {
+            for (Account account : accounts) {
+                am.addSharedAccount(account, user);
+            }
+        }
+        return newUserInfo;
+    }
+
+    private UserInfo createTrustedUser() {
+        UserInfo newUserInfo = mUserManager.createUser(
+                getResources().getString(R.string.user_new_user_name), 0);
+        if (newUserInfo != null) {
+            assignDefaultPhoto(newUserInfo);
+        }
+        return newUserInfo;
+    }
+
+    private void onManageUserClicked(int userId, boolean newUser) {
+        UserInfo info = mUserManager.getUserInfo(userId);
+        if (info.isRestricted() && mIsOwner) {
+            Bundle extras = new Bundle();
+            extras.putInt(AppRestrictionsFragment.EXTRA_USER_ID, userId);
+            extras.putBoolean(AppRestrictionsFragment.EXTRA_NEW_USER, newUser);
+            ((PreferenceActivity) getActivity()).startPreferencePanel(
+                    AppRestrictionsFragment.class.getName(),
+                    extras, R.string.user_restrictions_title, null,
+                    null, 0);
+        } else if (info.id == UserHandle.myUserId()) {
+            // Jump to owner info panel
+            Bundle extras = new Bundle();
+            if (!info.isRestricted()) {
+                extras.putBoolean(OwnerInfoSettings.EXTRA_SHOW_NICKNAME, true);
+            }
+            int titleResId = info.id == UserHandle.USER_OWNER ? R.string.owner_info_settings_title
+                    : (info.isRestricted() ? R.string.profile_info_settings_title
+                            : R.string.user_info_settings_title);
+            ((PreferenceActivity) getActivity()).startPreferencePanel(
+                    OwnerInfoSettings.class.getName(),
+                    extras, titleResId, null, null, 0);
+        }
+    }
+
     private void onUserCreated(int userId) {
         mAddedUserId = userId;
-        showDialog(DIALOG_SETUP_USER);
+        if (mUserManager.getUserInfo(userId).isRestricted()) {
+            showDialog(DIALOG_SETUP_PROFILE);
+        } else {
+            showDialog(DIALOG_SETUP_USER);
+        }
     }
 
     @Override
@@ -298,15 +413,21 @@
 
     @Override
     public Dialog onCreateDialog(int dialogId) {
+        Context context = getActivity();
+        if (context == null) return null;
         switch (dialogId) {
             case DIALOG_CONFIRM_REMOVE: {
                 Dialog dlg = new AlertDialog.Builder(getActivity())
                     .setTitle(UserHandle.myUserId() == mRemovingUserId
                             ? R.string.user_confirm_remove_self_title
-                            : R.string.user_confirm_remove_title)
+                            : (mUserManager.getUserInfo(mRemovingUserId).isRestricted()
+                                    ? R.string.user_profile_confirm_remove_title
+                                    : R.string.user_confirm_remove_title))
                     .setMessage(UserHandle.myUserId() == mRemovingUserId
                             ? R.string.user_confirm_remove_self_message
-                            : R.string.user_confirm_remove_message)
+                            : (mUserManager.getUserInfo(mRemovingUserId).isRestricted()
+                                    ? R.string.user_profile_confirm_remove_message
+                                    : R.string.user_confirm_remove_message))
                     .setPositiveButton(R.string.user_delete_button,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int which) {
@@ -318,7 +439,7 @@
                 return dlg;
             }
             case DIALOG_USER_CANNOT_MANAGE:
-                return new AlertDialog.Builder(getActivity())
+                return new AlertDialog.Builder(context)
                     .setMessage(R.string.user_cannot_manage_message)
                     .setPositiveButton(android.R.string.ok, null)
                     .create();
@@ -330,35 +451,89 @@
                 final int messageResId = longMessageDisplayed
                         ? R.string.user_add_user_message_short
                         : R.string.user_add_user_message_long;
-                Dialog dlg = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.user_add_user_title)
-                .setMessage(messageResId)
-                .setPositiveButton(android.R.string.ok,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            addUserNow();
-                            if (!longMessageDisplayed) {
-                                preferences.edit().putBoolean(KEY_ADD_USER_LONG_MESSAGE_DISPLAYED,
-                                        true).commit();
+                final int userType = dialogId == DIALOG_ADD_USER
+                        ? USER_TYPE_USER : USER_TYPE_RESTRICTED_PROFILE;
+                Dialog dlg = new AlertDialog.Builder(context)
+                    .setTitle(R.string.user_add_user_title)
+                    .setMessage(messageResId)
+                    .setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                addUserNow(userType);
+                                if (!longMessageDisplayed) {
+                                    preferences.edit().putBoolean(
+                                            KEY_ADD_USER_LONG_MESSAGE_DISPLAYED, true).apply();
+                                }
                             }
-                        }
-                })
-                .setNegativeButton(android.R.string.cancel, null)
-                .create();
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
                 return dlg;
             }
             case DIALOG_SETUP_USER: {
-                Dialog dlg = new AlertDialog.Builder(getActivity())
-                .setTitle(R.string.user_setup_dialog_title)
-                .setMessage(R.string.user_setup_dialog_message)
-                .setPositiveButton(R.string.user_setup_button_setup_now,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            switchUserNow(mAddedUserId);
-                        }
-                })
-                .setNegativeButton(R.string.user_setup_button_setup_later, null)
-                .create();
+                Dialog dlg = new AlertDialog.Builder(context)
+                    .setTitle(R.string.user_setup_dialog_title)
+                    .setMessage(R.string.user_setup_dialog_message)
+                    .setPositiveButton(R.string.user_setup_button_setup_now,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                switchUserNow(mAddedUserId);
+                            }
+                    })
+                    .setNegativeButton(R.string.user_setup_button_setup_later, null)
+                    .create();
+                return dlg;
+            }
+            case DIALOG_SETUP_PROFILE: {
+                Dialog dlg = new AlertDialog.Builder(context)
+                    .setMessage(R.string.user_setup_profile_dialog_message)
+                    .setPositiveButton(android.R.string.ok,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                                switchUserNow(mAddedUserId);
+                            }
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create();
+                return dlg;
+            }
+            case DIALOG_CHOOSE_USER_TYPE: {
+                List<HashMap<String, String>> data = new ArrayList<HashMap<String,String>>();
+                HashMap<String,String> addUserItem = new HashMap<String,String>();
+                addUserItem.put(KEY_TITLE, getString(R.string.user_add_user_item_title));
+                addUserItem.put(KEY_SUMMARY, getString(R.string.user_add_user_item_summary));
+                HashMap<String,String> addProfileItem = new HashMap<String,String>();
+                addProfileItem.put(KEY_TITLE, getString(R.string.user_add_profile_item_title));
+                addProfileItem.put(KEY_SUMMARY, getString(R.string.user_add_profile_item_summary));
+                data.add(addUserItem);
+                data.add(addProfileItem);
+                Dialog dlg = new AlertDialog.Builder(context)
+                        .setTitle(R.string.user_add_user_type_title)
+                        .setAdapter(new SimpleAdapter(context, data, R.layout.two_line_list_item,
+                                new String[] {KEY_TITLE, KEY_SUMMARY},
+                                new int[] {R.id.title, R.id.summary}),
+                                new DialogInterface.OnClickListener() {
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        onAddUserClicked(which == 0
+                                                ? USER_TYPE_USER
+                                                : USER_TYPE_RESTRICTED_PROFILE);
+                                    }
+                                })
+                        .create();
+                return dlg;
+            }
+            case DIALOG_NEED_LOCKSCREEN: {
+                Dialog dlg = new AlertDialog.Builder(context)
+                        .setMessage(R.string.user_need_lock_message)
+                        .setPositiveButton(R.string.user_set_lock_button,
+                                new DialogInterface.OnClickListener() {
+                                    @Override
+                                    public void onClick(DialogInterface dialog, int which) {
+                                        launchChooseLockscreen();
+                                    }
+                                })
+                        .setNegativeButton(android.R.string.cancel, null)
+                        .create();
                 return dlg;
             }
             default:
@@ -391,23 +566,29 @@
         }
     }
 
-    private void addUserNow() {
+    private void addUserNow(final int userType) {
         synchronized (mUserLock) {
             mAddingUser = true;
-            updateUserList();
+            //updateUserList();
             new Thread() {
                 public void run() {
+                    UserInfo user = null;
                     // Could take a few seconds
-                    UserInfo user = mUserManager.createUser(
-                            getActivity().getResources().getString(R.string.user_new_user_name), 0);
-                    if (user != null) {
-                        assignDefaultPhoto(user);
+                    if (userType == USER_TYPE_USER) {
+                        user = createTrustedUser();
+                    } else {
+                        user = createLimitedUser();
                     }
                     synchronized (mUserLock) {
                         mAddingUser = false;
-                        mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
-                        mHandler.sendMessage(mHandler.obtainMessage(
-                                MESSAGE_SETUP_USER, user.id, user.serialNumber));
+                        if (userType == USER_TYPE_USER) {
+                            mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
+                            mHandler.sendMessage(mHandler.obtainMessage(
+                                    MESSAGE_SETUP_USER, user.id, user.serialNumber));
+                        } else {
+                            mHandler.sendMessage(mHandler.obtainMessage(
+                                    MESSAGE_CONFIG_USER, user.id, user.serialNumber));
+                        }
                     }
                 }
             }.start();
@@ -428,17 +609,17 @@
 
         mUserListCategory.removeAll();
         mUserListCategory.setOrderingAsAdded(false);
+        mUserListCategory.addPreference(mMePreference);
 
         final ArrayList<Integer> missingIcons = new ArrayList<Integer>();
         for (UserInfo user : users) {
             Preference pref;
             if (user.id == UserHandle.myUserId()) {
                 pref = mMePreference;
-                mNicknamePreference.setText(user.name);
-                mNicknamePreference.setSummary(user.name);
             } else {
                 pref = new UserPreference(getActivity(), null, user.id,
-                        UserHandle.myUserId() == UserHandle.USER_OWNER, this);
+                        mIsOwner && user.isRestricted() ? this : null,
+                        mIsOwner ? this : null);
                 pref.setOnPreferenceClickListener(this);
                 pref.setKey("id=" + user.id);
                 mUserListCategory.addPreference(pref);
@@ -446,14 +627,18 @@
                     pref.setSummary(R.string.user_owner);
                 }
                 pref.setTitle(user.name);
-                if (!isInitialized(user)) {
-                    pref.setSummary(R.string.user_summary_not_set_up);
-                }
+            }
+            if (!isInitialized(user)) {
+                pref.setSummary(user.isRestricted()
+                        ? R.string.user_summary_restricted_not_set_up
+                        : R.string.user_summary_not_set_up);
+            } else if (user.isRestricted()) {
+                pref.setSummary(R.string.user_summary_restricted_profile);
             }
             if (user.iconPath != null) {
                 if (mUserIcons.get(user.id) == null) {
                     missingIcons.add(user.id);
-                    pref.setIcon(R.drawable.avatar_default_1);
+                    pref.setIcon(encircle(R.drawable.avatar_default_1));
                 } else {
                     setPhotoId(pref, user);
                 }
@@ -462,11 +647,10 @@
         // Add a temporary entry for the user being created
         if (mAddingUser) {
             Preference pref = new UserPreference(getActivity(), null, UserPreference.USERID_UNKNOWN,
-                    false, null);
+                    null, null);
             pref.setEnabled(false);
             pref.setTitle(R.string.user_new_user_name);
-            pref.setSummary(R.string.user_adding_new_user);
-            pref.setIcon(R.drawable.avatar_default_1);
+            pref.setIcon(encircle(R.drawable.avatar_default_1));
             mUserListCategory.addPreference(pref);
         }
         getActivity().invalidateOptionsMenu();
@@ -475,6 +659,8 @@
         if (missingIcons.size() > 0) {
             loadIconsAsync(missingIcons);
         }
+        boolean moreUsers = mUserManager.getMaxSupportedUsers() > users.size();
+        mAddUser.setEnabled(moreUsers);
     }
 
     private void loadIconsAsync(List<Integer> missingIcons) {
@@ -489,8 +675,7 @@
             protected Void doInBackground(List<Integer>... values) {
                 for (int userId : values[0]) {
                     Bitmap bitmap = mUserManager.getUserIcon(userId);
-                    Drawable d = new BitmapDrawable(resources, bitmap);
-                    mUserIcons.append(userId, d);
+                    mUserIcons.append(userId, bitmap);
                 }
                 return null;
             }
@@ -518,9 +703,9 @@
     }
 
     private void setPhotoId(Preference pref, UserInfo user) {
-        Drawable d = mUserIcons.get(user.id); // UserUtils.getUserIcon(mUserManager, user);
-        if (d != null) {
-            pref.setIcon(d);
+        Bitmap bitmap = mUserIcons.get(user.id);
+        if (bitmap != null) {
+            pref.setIcon(encircle(bitmap));
         }
     }
 
@@ -544,7 +729,13 @@
             // To make sure that it returns back here when done
             // TODO: Make this a proper API
             editProfile.putExtra("finishActivityOnSaveCompleted", true);
-            startActivity(editProfile);
+
+            // If this is a limited user, launch the user info settings instead of profile editor
+            if (mUserManager.isLinkedUser()) {
+                onManageUserClicked(UserHandle.myUserId(), false);
+            } else {
+                startActivity(editProfile);
+            }
         } else if (pref instanceof UserPreference) {
             int userId = ((UserPreference) pref).getUserId();
             // Get the latest status of the user
@@ -555,8 +746,12 @@
                 if (!isInitialized(user)) {
                     mHandler.sendMessage(mHandler.obtainMessage(
                             MESSAGE_SETUP_USER, user.id, user.serialNumber));
+                } else if (user.isRestricted()) {
+                    onManageUserClicked(user.id, false);
                 }
             }
+        } else if (pref == mAddUser) {
+            showDialog(DIALOG_CHOOSE_USER_TYPE);
         }
         return false;
     }
@@ -565,11 +760,28 @@
         return (user.flags & UserInfo.FLAG_INITIALIZED) != 0;
     }
 
+    private Drawable encircle(int iconResId) {
+        Bitmap icon = BitmapFactory.decodeResource(getResources(), iconResId);
+        return encircle(icon);
+    }
+
+    private Drawable encircle(Bitmap icon) {
+        Drawable circled = CircleFramedDrawable.getInstance(getActivity(), icon);
+        return circled;
+    }
+
     @Override
     public void onClick(View v) {
         if (v.getTag() instanceof UserPreference) {
             int userId = ((UserPreference) v.getTag()).getUserId();
-            onRemoveUserClicked(userId);
+            switch (v.getId()) {
+            case UserPreference.DELETE_ID:
+                onRemoveUserClicked(userId);
+                break;
+            case UserPreference.SETTINGS_ID:
+                onManageUserClicked(userId, false);
+                break;
+            }
         }
     }
 
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 96ac392..73aae99 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -66,6 +66,8 @@
 
     private static final String TAG_LOCKDOWN = "lockdown";
 
+    private static final String EXTRA_PICK_LOCKDOWN = "android.net.vpn.PICK_LOCKDOWN";
+
     // TODO: migrate to using DialogFragment when editing
 
     private final IConnectivityManager mService = IConnectivityManager.Stub
@@ -154,6 +156,12 @@
     public void onResume() {
         super.onResume();
 
+        final boolean pickLockdown = getActivity()
+                .getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false);
+        if (pickLockdown) {
+            LockdownConfigFragment.show(this);
+        }
+
         // Check KeyStore here, so others do not need to deal with it.
         if (!mKeyStore.isUnlocked()) {
             if (!mUnlocking) {
@@ -229,7 +237,8 @@
         if (button == DialogInterface.BUTTON_POSITIVE) {
             // Always save the profile.
             VpnProfile profile = mDialog.getProfile();
-            mKeyStore.put(Credentials.VPN + profile.key, profile.encode());
+            mKeyStore.put(Credentials.VPN + profile.key, profile.encode(), KeyStore.UID_SELF,
+                    KeyStore.FLAG_ENCRYPTED);
 
             // Update the preference.
             VpnPreference preference = mPreferences.get(profile.key);
@@ -522,7 +531,8 @@
                                     Toast.LENGTH_LONG).show();
                             return;
                         }
-                        keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes());
+                        keyStore.put(Credentials.LOCKDOWN_VPN, profile.key.getBytes(),
+                                KeyStore.UID_SELF, KeyStore.FLAG_ENCRYPTED);
                     }
 
                     // kick profiles since we changed them
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java
index f1d0e70..5b732d6 100755
--- a/src/com/android/settings/wfd/WifiDisplaySettings.java
+++ b/src/com/android/settings/wfd/WifiDisplaySettings.java
@@ -93,24 +93,19 @@
 
         Activity activity = getActivity();
         mActionBarSwitch = new Switch(activity);
-        if (activity instanceof PreferenceActivity) {
-            PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
-            if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
-                final int padding = activity.getResources().getDimensionPixelSize(
-                        R.dimen.action_bar_switch_padding);
-                mActionBarSwitch.setPadding(0, 0, padding, 0);
-                activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
-                        ActionBar.DISPLAY_SHOW_CUSTOM);
-                activity.getActionBar().setCustomView(mActionBarSwitch,
-                        new ActionBar.LayoutParams(
-                                ActionBar.LayoutParams.WRAP_CONTENT,
-                                ActionBar.LayoutParams.WRAP_CONTENT,
-                                Gravity.CENTER_VERTICAL | Gravity.END));
-            }
-        }
-
         mActionBarSwitch.setOnCheckedChangeListener(mSwitchOnCheckedChangedListener);
 
+        final int padding = activity.getResources().getDimensionPixelSize(
+                R.dimen.action_bar_switch_padding);
+        mActionBarSwitch.setPaddingRelative(0, 0, padding, 0);
+        activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
+                ActionBar.DISPLAY_SHOW_CUSTOM);
+        activity.getActionBar().setCustomView(mActionBarSwitch,
+                new ActionBar.LayoutParams(
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        ActionBar.LayoutParams.WRAP_CONTENT,
+                        Gravity.CENTER_VERTICAL | Gravity.END));
+
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
         getListView().setEmptyView(mEmptyView);
 
@@ -122,6 +117,12 @@
     }
 
     @Override
+    public void onDestroyView() {
+        getActivity().getActionBar().setCustomView(null);
+        super.onDestroyView();
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
 
diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
index f358ada..ec5882c 100644
--- a/src/com/android/settings/widget/ChartGridView.java
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -32,8 +32,8 @@
 import android.util.TypedValue;
 import android.view.View;
 
+import com.android.internal.util.Preconditions;
 import com.android.settings.R;
-import com.google.common.base.Preconditions;
 
 /**
  * Background of {@link ChartView} that renders grid lines as requested by
diff --git a/src/com/android/settings/widget/ChartNetworkSeriesView.java b/src/com/android/settings/widget/ChartNetworkSeriesView.java
index 5a37bfc..6250a25 100644
--- a/src/com/android/settings/widget/ChartNetworkSeriesView.java
+++ b/src/com/android/settings/widget/ChartNetworkSeriesView.java
@@ -33,8 +33,8 @@
 import android.util.Log;
 import android.view.View;
 
+import com.android.internal.util.Preconditions;
 import com.android.settings.R;
-import com.google.common.base.Preconditions;
 
 /**
  * {@link NetworkStatsHistory} series to render inside a {@link ChartView},
diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java
index 68676d8..774e5d8 100644
--- a/src/com/android/settings/widget/ChartSweepView.java
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -35,8 +35,8 @@
 import android.view.MotionEvent;
 import android.view.View;
 
+import com.android.internal.util.Preconditions;
 import com.android.settings.R;
-import com.google.common.base.Preconditions;
 
 /**
  * Sweep across a {@link ChartView} at a specific {@link ChartAxis} value, which
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
index 6441612..69e6e94 100644
--- a/src/com/android/settings/widget/ChartView.java
+++ b/src/com/android/settings/widget/ChartView.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.widget;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Rect;
@@ -27,6 +25,7 @@
 import android.view.ViewDebug;
 import android.widget.FrameLayout;
 
+import com.android.internal.util.Preconditions;
 import com.android.settings.R;
 
 /**
@@ -71,8 +70,8 @@
     }
 
     void init(ChartAxis horiz, ChartAxis vert) {
-        mHoriz = checkNotNull(horiz, "missing horiz");
-        mVert = checkNotNull(vert, "missing vert");
+        mHoriz = Preconditions.checkNotNull(horiz, "missing horiz");
+        mVert = Preconditions.checkNotNull(vert, "missing vert");
     }
 
     public void setOptimalWidth(int optimalWidth, float optimalWidthWeight) {
diff --git a/src/com/android/settings/widget/PieChartView.java b/src/com/android/settings/widget/PieChartView.java
index bd77f04..6070190 100644
--- a/src/com/android/settings/widget/PieChartView.java
+++ b/src/com/android/settings/widget/PieChartView.java
@@ -32,7 +32,7 @@
 import android.util.Log;
 import android.view.View;
 
-import com.google.common.collect.Lists;
+import com.google.android.collect.Lists;
 
 import java.util.ArrayList;
 
diff --git a/src/com/android/settings/widget/SettingsAppWidgetProvider.java b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
index a722818..5d581d8 100644
--- a/src/com/android/settings/widget/SettingsAppWidgetProvider.java
+++ b/src/com/android/settings/widget/SettingsAppWidgetProvider.java
@@ -24,8 +24,6 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SyncStorageEngine;
-import android.content.pm.PackageManager;
 import android.database.ContentObserver;
 import android.location.LocationManager;
 import android.net.ConnectivityManager;
@@ -37,9 +35,11 @@
 import android.os.PowerManager;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.util.Log;
 import android.widget.RemoteViews;
+
 import com.android.settings.R;
 import com.android.settings.bluetooth.LocalBluetoothAdapter;
 import com.android.settings.bluetooth.LocalBluetoothManager;
@@ -539,11 +539,18 @@
             new AsyncTask<Void, Void, Boolean>() {
                 @Override
                 protected Boolean doInBackground(Void... args) {
-                    Settings.Secure.setLocationProviderEnabled(
-                        resolver,
-                        LocationManager.GPS_PROVIDER,
-                        desiredState);
-                    return desiredState;
+                    final UserManager um =
+                            (UserManager) context.getSystemService(Context.USER_SERVICE);
+                    if (!um.hasUserRestriction(UserManager.DISALLOW_SHARE_LOCATION)) {
+                        Settings.Secure.setLocationProviderEnabled(
+                            resolver,
+                            LocationManager.GPS_PROVIDER,
+                            desiredState);
+                        return desiredState;
+                    }
+                    return Settings.Secure.isLocationProviderEnabled(
+                            resolver,
+                            LocationManager.GPS_PROVIDER);
                 }
 
                 @Override
@@ -776,8 +783,7 @@
             sBluetoothState.onActualStateChange(context, intent);
         } else if (LocationManager.PROVIDERS_CHANGED_ACTION.equals(action)) {
             sGpsState.onActualStateChange(context, intent);
-        } else if (SyncStorageEngine.SYNC_CONNECTION_SETTING_CHANGED_INTENT.getAction()
-                .equals(action)) {
+        } else if (ContentResolver.ACTION_SYNC_CONN_STATUS_CHANGED.equals(action)) {
             sSyncState.onActualStateChange(context, intent);
         } else if (intent.hasCategory(Intent.CATEGORY_ALTERNATIVE)) {
             Uri data = intent.getData();
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 809496a..7663058 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.wifi;
 
 import android.content.Context;
+import android.content.Intent;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiWatchdogStateMachine;
@@ -27,6 +28,7 @@
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
 import android.provider.Settings.Global;
+import android.security.Credentials;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
@@ -45,6 +47,8 @@
     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_POOR_NETWORK_DETECTION = "wifi_poor_network_detection";
+    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_SUSPEND_OPTIMIZATIONS = "suspend_optimizations";
 
     private WifiManager mWifiManager;
@@ -88,6 +92,18 @@
             }
         }
 
+        CheckBoxPreference scanAlwaysAvailable =
+            (CheckBoxPreference) 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");
+        intent.putExtra(Credentials.EXTRA_INSTALL_AS_UID, android.os.Process.WIFI_UID);
+        Preference pref = findPreference(KEY_INSTALL_CREDENTIALS);
+        pref.setIntent(intent);
+
         CheckBoxPreference suspendOptimizations =
             (CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS);
         suspendOptimizations.setChecked(Global.getInt(getContentResolver(),
@@ -100,6 +116,7 @@
             int value = mWifiManager.getFrequencyBand();
             if (value != -1) {
                 frequencyPref.setValue(String.valueOf(value));
+                updateFrequencyBandSummary(frequencyPref, value);
             } else {
                 Log.e(TAG, "Failed to fetch frequency band");
             }
@@ -145,6 +162,11 @@
         Log.e(TAG, "Invalid sleep policy value: " + value);
     }
 
+    private void updateFrequencyBandSummary(Preference frequencyBandPref, int index) {
+        String[] summaries = getResources().getStringArray(R.array.wifi_frequency_band_entries);
+        frequencyBandPref.setSummary(summaries[index]);
+    }
+
     @Override
     public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
         String key = preference.getKey();
@@ -161,6 +183,10 @@
             Global.putInt(getContentResolver(),
                     Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,
                     ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
+        } else if (KEY_SCAN_ALWAYS_AVAILABLE.equals(key)) {
+            Global.putInt(getContentResolver(),
+                    Global.WIFI_SCAN_ALWAYS_AVAILABLE,
+                    ((CheckBoxPreference) preference).isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(screen, preference);
         }
@@ -173,7 +199,9 @@
 
         if (KEY_FREQUENCY_BAND.equals(key)) {
             try {
-                mWifiManager.setFrequencyBand(Integer.parseInt((String) newValue), true);
+                int value = Integer.parseInt((String) newValue);
+                mWifiManager.setFrequencyBand(value, true);
+                updateFrequencyBandSummary(preference, value);
             } catch (NumberFormatException e) {
                 Toast.makeText(getActivity(), R.string.wifi_setting_frequency_band_error,
                         Toast.LENGTH_SHORT).show();
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 60ab1ca..587197b 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -49,9 +49,11 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
@@ -76,6 +78,7 @@
     // e.g. AccessPoint.SECURITY_NONE
     private int mAccessPointSecurity;
     private TextView mPasswordView;
+    private CheckBox mShowPassword;
 
     private String unspecifiedCert = "unspecified";
     private static final int unspecifiedCertIndex = 0;
@@ -555,8 +558,13 @@
         if (mPasswordView == null) {
             mPasswordView = (TextView) mView.findViewById(R.id.password);
             mPasswordView.addTextChangedListener(this);
-            ((CheckBox) mView.findViewById(R.id.show_password)).setOnClickListener(this);
-
+            mShowPassword = (CheckBox) mView.findViewById(R.id.show_password);
+            mShowPassword.setOnClickListener(this);
+            mShowPassword.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+                public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                    updatePasswordVisibility(isChecked);
+                }
+            });
             if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
                 mPasswordView.setHint(R.string.wifi_unchanged);
             }
@@ -811,7 +819,7 @@
     private void loadCertificates(Spinner spinner, String prefix) {
         final Context context = mConfigUi.getContext();
 
-        String[] certs = KeyStore.getInstance().saw(prefix);
+        String[] certs = KeyStore.getInstance().saw(prefix, android.os.Process.WIFI_UID);
         if (certs == null || certs.length == 0) {
             certs = new String[] {unspecifiedCert};
         } else {
@@ -866,14 +874,7 @@
     @Override
     public void onClick(View view) {
         if (view.getId() == R.id.show_password) {
-            int pos = mPasswordView.getSelectionEnd();
-            mPasswordView.setInputType(
-                    InputType.TYPE_CLASS_TEXT | (((CheckBox) view).isChecked() ?
-                            InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD :
-                                InputType.TYPE_TEXT_VARIATION_PASSWORD));
-            if (pos >= 0) {
-                ((EditText)mPasswordView).setSelection(pos);
-            }
+            updatePasswordVisibility(((CheckBox) view).isChecked());
         } else if (view.getId() == R.id.wifi_advanced_togglebox) {
             if (((CheckBox) view).isChecked()) {
                 mView.findViewById(R.id.wifi_advanced_fields).setVisibility(View.VISIBLE);
@@ -902,4 +903,18 @@
     public void onNothingSelected(AdapterView<?> parent) {
         //
     }
+
+    /**
+     * 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);
+        }
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index 641a7ab..846c324 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -20,10 +20,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.database.ContentObserver;
 import android.net.NetworkInfo;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.UserHandle;
 import android.provider.Settings;
 import android.widget.CompoundButton;
 import android.widget.Switch;
diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java
new file mode 100644
index 0000000..b83b22f
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiScanModeActivity.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import com.android.settings.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.content.Intent;
+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
+ */
+public class WifiScanModeActivity extends Activity {
+    private DialogFragment mDialog;
+    private String mApp;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        if (savedInstanceState == null) {
+            if (intent != null && intent.getAction()
+                    .equals(WifiManager.ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE)) {
+                mApp = getCallingPackage();
+            } else {
+                finish();
+                return;
+            }
+        } else {
+            mApp = savedInstanceState.getString("app");
+        }
+        createDialog();
+    }
+
+    private void createDialog() {
+        if (mDialog == null) {
+            mDialog = AlertDialogFragment.newInstance(mApp);
+            mDialog.show(getFragmentManager(), "dialog");
+        }
+    }
+
+    private void dismissDialog() {
+        if (mDialog != null) {
+            mDialog.dismiss();
+            mDialog = null;
+        }
+    }
+
+    private void doPositiveClick() {
+        Settings.Global.putInt(getContentResolver(),
+                Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1);
+        setResult(RESULT_OK);
+        finish();
+    }
+
+    private void doNegativeClick() {
+        setResult(RESULT_CANCELED);
+        finish();
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putString("app", mApp);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        dismissDialog();
+    }
+
+    public void onResume() {
+        super.onResume();
+        createDialog();
+    }
+
+    public static class AlertDialogFragment extends DialogFragment {
+        static AlertDialogFragment newInstance(String app) {
+            AlertDialogFragment frag = new AlertDialogFragment(app);
+            return frag;
+        }
+
+        private final String mApp;
+        public AlertDialogFragment(String app) {
+            super();
+            mApp = app;
+        }
+
+        public AlertDialogFragment() {
+            super();
+            mApp = null;
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            return new AlertDialog.Builder(getActivity())
+                    .setMessage(getString(R.string.wifi_scan_always_turnon_message, mApp))
+                    .setPositiveButton(R.string.wifi_scan_always_confirm_allow,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int whichButton) {
+                                    ((WifiScanModeActivity) getActivity()).doPositiveClick();
+                                }
+                            }
+                    )
+                    .setNegativeButton(R.string.wifi_scan_always_confirm_deny,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int whichButton) {
+                                    ((WifiScanModeActivity) getActivity()).doNegativeClick();
+                                }
+                            }
+                    )
+                    .create();
+        }
+        @Override
+        public void onCancel(DialogInterface dialog) {
+            ((WifiScanModeActivity) getActivity()).doNegativeClick();
+        }
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 274d49e..cb35e10 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -17,11 +17,11 @@
 package com.android.settings.wifi;
 
 import static android.net.wifi.WifiConfiguration.INVALID_NETWORK_ID;
+import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
 
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
 import android.app.Dialog;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -30,6 +30,7 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.NetworkInfo.DetailedState;
@@ -42,10 +43,11 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.UserManager;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceScreen;
-import android.security.Credentials;
+import android.provider.Settings;
 import android.telephony.TelephonyManager;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -114,6 +116,9 @@
     private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
 
+    // Activity result when pressing the Skip button
+    private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
+
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver;
     private final Scanner mScanner;
@@ -125,6 +130,8 @@
     private boolean mP2pSupported;
 
 
+    private UserManager mUserManager;
+
     private WifiEnabler mWifiEnabler;
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
@@ -250,9 +257,19 @@
                 customButton.setOnClickListener(new OnClickListener() {
                     @Override
                     public void onClick(View v) {
-                        if (isPhone() && !hasSimProblem()) {
+                        boolean isConnected = false;
+                        Activity activity = getActivity();
+                        final ConnectivityManager connectivity = (ConnectivityManager)
+                                activity.getSystemService(Context.CONNECTIVITY_SERVICE);
+                        if (connectivity != null) {
+                            final NetworkInfo info = connectivity.getActiveNetworkInfo();
+                            isConnected = (info != null) && info.isConnected();
+                        }
+                        if (isConnected) {
+                            // Warn of possible data charges
                             showDialog(WIFI_SKIPPED_DIALOG_ID);
                         } else {
+                            // Warn of lack of updates
                             showDialog(WIFI_AND_MOBILE_SKIPPED_DIALOG_ID);
                         }
                     }
@@ -275,10 +292,13 @@
 
         mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
         mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        mUserManager = (UserManager) getSystemService(Context.USER_SERVICE);
 
         mConnectListener = new WifiManager.ActionListener() {
+                                   @Override
                                    public void onSuccess() {
                                    }
+                                   @Override
                                    public void onFailure(int reason) {
                                        Activity activity = getActivity();
                                        if (activity != null) {
@@ -290,8 +310,10 @@
                                };
 
         mSaveListener = new WifiManager.ActionListener() {
+                                @Override
                                 public void onSuccess() {
                                 }
+                                @Override
                                 public void onFailure(int reason) {
                                     Activity activity = getActivity();
                                     if (activity != null) {
@@ -303,8 +325,10 @@
                             };
 
         mForgetListener = new WifiManager.ActionListener() {
+                                   @Override
                                    public void onSuccess() {
                                    }
+                                   @Override
                                    public void onFailure(int reason) {
                                        Activity activity = getActivity();
                                        if (activity != null) {
@@ -363,7 +387,7 @@
 
         if (mSetupWizardMode) {
             getView().setSystemUiVisibility(
-                    View.STATUS_BAR_DISABLE_BACK |
+//                    View.STATUS_BAR_DISABLE_BACK |
                     View.STATUS_BAR_DISABLE_HOME |
                     View.STATUS_BAR_DISABLE_RECENT |
                     View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
@@ -379,7 +403,7 @@
                 if (preferenceActivity.onIsHidingHeaders() || !preferenceActivity.onIsMultiPane()) {
                     final int padding = activity.getResources().getDimensionPixelSize(
                             R.dimen.action_bar_switch_padding);
-                    actionBarSwitch.setPadding(0, 0, padding, 0);
+                    actionBarSwitch.setPaddingRelative(0, 0, padding, 0);
                     activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
                             ActionBar.DISPLAY_SHOW_CUSTOM);
                     activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
@@ -424,6 +448,9 @@
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        // If the user is not allowed to configure wifi, do not show the menu.
+        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_WIFI)) return;
+
         final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
         if (mSetupWizardMode) {
             // FIXME: add setIcon() when graphics are available
@@ -479,6 +506,9 @@
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
+        // If the user is not allowed to configure wifi, do not handle menu selections.
+        if (mUserManager.hasUserRestriction(DISALLOW_CONFIG_WIFI)) return false;
+
         switch (item.getItemId()) {
             case MENU_ID_WPS_PBC:
                 showDialog(WPS_PBC_DIALOG_ID);
@@ -634,7 +664,7 @@
                                     new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int id) {
-                                    getActivity().setResult(Activity.RESULT_CANCELED);
+                                    getActivity().setResult(RESULT_SKIP);
                                     getActivity().finish();
                                 }
                             })
@@ -653,7 +683,7 @@
                                     new DialogInterface.OnClickListener() {
                                 @Override
                                 public void onClick(DialogInterface dialog, int id) {
-                                    getActivity().setResult(Activity.RESULT_CANCELED);
+                                    getActivity().setResult(RESULT_SKIP);
                                     getActivity().finish();
                                 }
                             })
@@ -669,26 +699,6 @@
         return super.onCreateDialog(dialogId);
     }
 
-    private boolean isPhone() {
-        final TelephonyManager telephonyManager = (TelephonyManager)this.getSystemService(
-                Context.TELEPHONY_SERVICE);
-        return telephonyManager != null
-                && telephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_NONE;
-    }
-
-    /**
-    * Return true if there's any SIM related impediment to connectivity.
-    * Treats Unknown as OK. (Only returns true if we're sure of a SIM problem.)
-    */
-   protected boolean hasSimProblem() {
-       final TelephonyManager telephonyManager = (TelephonyManager)this.getSystemService(
-               Context.TELEPHONY_SERVICE);
-       return telephonyManager != null
-               && telephonyManager.getCurrentPhoneType() == TelephonyManager.PHONE_TYPE_GSM
-               && telephonyManager.getSimState() != TelephonyManager.SIM_STATE_READY
-               && telephonyManager.getSimState() != TelephonyManager.SIM_STATE_UNKNOWN;
-   }
-
     /**
      * Shows the latest access points available with supplimental information like
      * the strength of network and the security for it.
@@ -697,6 +707,10 @@
         // Safeguard from some delayed event handling
         if (getActivity() == null) return;
 
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_WIFI)) {
+            addMessagePreference(R.string.wifi_empty_list_user_restricted);
+            return;
+        }
         final int wifiState = mWifiManager.getWifiState();
 
         switch (wifiState) {
@@ -721,11 +735,31 @@
                 break;
 
             case WifiManager.WIFI_STATE_DISABLED:
-                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                setOffMessage();
                 break;
         }
     }
 
+    private void setOffMessage() {
+        if (mEmptyView != null) {
+            mEmptyView.setText(R.string.wifi_empty_list_wifi_off);
+            if (Settings.Global.getInt(getActivity().getContentResolver(),
+                    Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1) {
+                mEmptyView.append("\n\n");
+                int resId;
+                if (Settings.Secure.isLocationProviderEnabled(getActivity().getContentResolver(),
+                        LocationManager.NETWORK_PROVIDER)) {
+                    resId = R.string.wifi_scan_notify_text_location_on;
+                } else {
+                    resId = R.string.wifi_scan_notify_text_location_off;
+                }
+                CharSequence charSeq = getText(resId);
+                mEmptyView.append(charSeq);
+            }
+        }
+        getPreferenceScreen().removeAll();
+    }
+
     private void addMessagePreference(int messageId) {
         if (mEmptyView != null) mEmptyView.setText(messageId);
         getPreferenceScreen().removeAll();
@@ -884,7 +918,7 @@
                 break;
 
             case WifiManager.WIFI_STATE_DISABLED:
-                addMessagePreference(R.string.wifi_empty_list_wifi_off);
+                setOffMessage();
                 break;
         }
 
@@ -914,7 +948,7 @@
 
         @Override
         public void handleMessage(Message message) {
-            if (mWifiManager.startScanActive()) {
+            if (mWifiManager.startScan()) {
                 mRetry = 0;
             } else if (++mRetry >= 3) {
                 mRetry = 0;
@@ -941,11 +975,14 @@
         }
     }
 
+    @Override
     public void onClick(DialogInterface dialogInterface, int button) {
         if (button == WifiDialog.BUTTON_FORGET && mSelectedAccessPoint != null) {
             forget();
         } else if (button == WifiDialog.BUTTON_SUBMIT) {
-            submit(mDialog.getController());
+            if (mDialog != null) {
+                submit(mDialog.getController());
+            }
         }
     }
 
@@ -1076,7 +1113,7 @@
             float titleHeight = resources.getFraction(R.dimen.setup_title_height, 1, 1);
             float sideMargin = resources.getFraction(R.dimen.setup_border_width, 1, 1);
             int bottom = resources.getDimensionPixelSize(R.dimen.setup_margin_bottom);
-            setPadding(
+            setPaddingRelative(
                     (int) (parentWidth * sideMargin),
                     0,
                     (int) (parentWidth * sideMargin),
diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
index beae432..63ef549 100644
--- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
+++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java
@@ -35,7 +35,6 @@
 import android.net.wifi.p2p.WifiP2pGroupList;
 import android.net.wifi.p2p.WifiP2pManager;
 import android.net.wifi.p2p.WifiP2pManager.GroupInfoListener;
-import android.net.wifi.p2p.WifiP2pManager.PeerListListener;
 import android.net.wifi.p2p.WifiP2pManager.PersistentGroupInfoListener;
 import android.net.wifi.WpsInfo;
 import android.os.Bundle;
@@ -46,6 +45,7 @@
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
+import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
@@ -67,7 +67,7 @@
  * Displays Wi-fi p2p settings UI
  */
 public class WifiP2pSettings extends SettingsPreferenceFragment
-        implements PeerListListener, PersistentGroupInfoListener, GroupInfoListener {
+        implements PersistentGroupInfoListener, GroupInfoListener {
 
     private static final String TAG = "WifiP2pSettings";
     private static final boolean DBG = false;
@@ -118,9 +118,9 @@
                     WifiP2pManager.WIFI_P2P_STATE_DISABLED) == WifiP2pManager.WIFI_P2P_STATE_ENABLED;
                 handleP2pStateChanged();
             } else if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) {
-                if (mWifiP2pManager != null) {
-                    mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
-                }
+                mPeers = (WifiP2pDeviceList) intent.getParcelableExtra(
+                        WifiP2pManager.EXTRA_P2P_DEVICE_LIST);
+                handlePeersChanged();
             } else if (WifiP2pManager.WIFI_P2P_CONNECTION_CHANGED_ACTION.equals(action)) {
                 if (mWifiP2pManager == null) return;
                 NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra(
@@ -431,6 +431,7 @@
             return dialog;
         } else if (id == DIALOG_RENAME) {
             mDeviceNameText = new EditText(getActivity());
+            mDeviceNameText.setFilters(new InputFilter[] {new InputFilter.LengthFilter(30)});
             if (mSavedDeviceName != null) {
                 mDeviceNameText.setText(mSavedDeviceName);
                 mDeviceNameText.setSelection(mSavedDeviceName.length());
@@ -469,13 +470,13 @@
         }
     }
 
-    public void onPeersAvailable(WifiP2pDeviceList peers) {
+    private void handlePeersChanged() {
         mPeersGroup.removeAll();
 
-        mPeers = peers;
         mConnectedDevices = 0;
-        for (WifiP2pDevice peer: peers.getDeviceList()) {
-            if (DBG) Log.d(TAG, " peer " + peer);
+        if (DBG) Log.d(TAG, "List of available peers");
+        for (WifiP2pDevice peer: mPeers.getDeviceList()) {
+            if (DBG) Log.d(TAG, "-> " + peer);
             mPeersGroup.addPreference(new WifiP2pPeer(getActivity(), peer));
             if (peer.status == WifiP2pDevice.CONNECTED) mConnectedDevices++;
         }
@@ -511,9 +512,6 @@
 
             mPersistentGroup.setEnabled(true);
             preferenceScreen.addPreference(mPersistentGroup);
-
-            /* Request latest set of peers */
-            mWifiP2pManager.requestPeers(mChannel, WifiP2pSettings.this);
         }
     }